Merge pull request #371 from opjenkin/op-build-update_92_6-26-2020

op-build update 6-26-2020