Merge pull request #419 from opjenkin/op-build-update_1017_7-24-2020

op-build update 7-24-2020