Merge pull request #279 from opjenkin/op-build-update_845_4-22-2020

op-build update 4-22-2020