Merge pull request #515 from opjenkin/op-build-update_2123_9-18-2020

op-build update 9-18-2020