Merge pull request #264 from opjenkin/op-build-update_1927_4-11-2020

op-build update 4-11-2020