Merge pull request #269 from opjenkin/op-build-update_030_4-15-2020

op-build update 4-15-2020