Merge pull request #295 from opjenkin/op-build-update_030_5-6-2020

op-build update 5-6-2020