Merge pull request #1334 from op-jenkins/op-build-update_950_8-14-2017

op-build update 8-14-2017