Merge pull request #1075 from op-jenkins/op-build-update_05_5-12-2017

op-build update 5-12-2017