Merge pull request #454 from opjenkin/op-build-update_1017_8-14-2020

op-build update 8-14-2020