Merge pull request #396 from opjenkin/op-build-update_96_7-15-2020

op-build update 7-15-2020