Merge pull request #467 from opjenkin/op-build-update_1316_8-24-2020

op-build update 8-24-2020