Merge pull request #517 from opjenkin/op-build-update_1418_9-19-2020

op-build update 9-19-2020