Merge pull request #549 from op-jenkins/op_update_7-22-2016

op-build update 7-22-2016