Merge pull request #1233 from op-jenkins/op-build-update_025_7-11-2017

op-build update 7-11-2017