Merge pull request #1375 from op-jenkins/op-build-update_827_8-25-2017

op-build update 8-25-2017