Merge pull request #381 from opjenkin/op-build-update_030_7-6-2020

op-build update 7-6-2020