Merge pull request #315 from opjenkin/op-build-update_030_5-21-2020

op-build update 5-21-2020