Merge pull request #398 from opjenkin/op-build-update_030_7-16-2020

op-build update 7-16-2020