Merge pull request #502 from op-jenkins/op_update_6-23-2016

op-build update 6-23-2016