Merge pull request #495 from opjenkin/op-build-update_919_9-6-2020

op-build update 9-6-2020