Merge pull request #602 from opjenkin/op-build-update_859_11-6-2020

op-build update 11-6-2020