Merge pull request #465 from opjenkin/op-build-update_1313_8-23-2020

op-build update 8-23-2020