Merge pull request #522 from op-jenkins/op_update_7-12-2016

op-build update 7-12-2016