Merge pull request #536 from op-jenkins/op_update_7-19-2016

op-build update 7-19-2016