Merge pull request #215 from opjenkin/op-build-update_1026_3-6-2020

op-build update 3-6-2020