Merge pull request #1238 from op-jenkins/op-build-update_025_7-12-2017

op-build update 7-12-2017