Merge pull request #549 from opjenkin/op-build-update_1013_10-5-2020

op-build update 10-5-2020