Merge pull request #308 from opjenkin/op-build-update_911_5-17-2020

op-build update 5-17-2020