Merge pull request #154 from opjenkin/op-build-update_1255_2-4-2020

op-build update 2-4-2020