Merge pull request #769 from op-jenkins/op_update_05_12-7-2016

op-build update 12-7-2016