Merge pull request #271 from opjenkin/op-build-update_030_4-17-2020

op-build update 4-17-2020