Merge pull request #546 from op-jenkins/op_update_7-21-2016

op-build update 7-21-2016