Merge pull request #345 from opjenkin/op-build-update_030_6-16-2020

op-build update 6-16-2020