Merge pull request #328 from op-jenkins/op_update_1-7-2016

op-build update 1-7-2016