Merge pull request #1428 from op-jenkins/op-build-update_1040_9-12-2017

op-build update 9-12-2017