Merge pull request #387 from opjenkin/op-build-update_030_7-8-2020

op-build update 7-8-2020