Merge pull request #1293 from op-jenkins/op-build-update_025_8-1-2017

op-build update 8-1-2017