Merge pull request #369 from opjenkin/op-build-update_911_6-25-2020

op-build update 6-25-2020