Merge pull request #266 from opjenkin/op-build-update_1343_4-13-2020

op-build update 4-13-2020