Merge pull request #1303 from op-jenkins/op-build-update_95_8-4-2017

op-build update 8-4-2017