Merge pull request #214 from opjenkin/op-build-update_837_3-6-2020

op-build update 3-6-2020