Merge pull request #535 from opjenkin/op-build-update_030_9-25-2020

op-build update 9-25-2020