Merge pull request #310 from opjenkin/op-build-update_030_5-18-2020

op-build update 5-18-2020