Merge pull request #506 from op-jenkins/op_update_6-27-2016

op-build update 6-27-2016