Merge pull request #517 from op-jenkins/op_update_7-5-2016

op-build update 7-5-2016