Merge pull request #1330 from op-jenkins/op-build-update_920_8-11-2017

op-build update 8-11-2017