Merge pull request #316 from op-jenkins/op_update_12-7-2015

op-build update 12-7-2015