Merge pull request #491 from opjenkin/op-build-update_945_9-3-2020

op-build update 9-3-2020