Merge pull request #322 from opjenkin/op-build-update_030_5-27-2020

op-build update 5-27-2020