Merge pull request #219 from opjenkin/op-build-update_1039_3-9-2020

op-build update 3-9-2020