Merge pull request #1292 from op-jenkins/op-build-update_025_7-31-2017

op-build update 7-31-2017