Merge pull request #2339 from op-jenkins/op-build-update_148_9-12-2018

op-build update 9-12-2018