Merge pull request #393 from opjenkin/op-build-update_030_7-13-2020

op-build update 7-13-2020