Merge pull request #477 from op-jenkins/op_update_5-16-2016

op-build update 5-16-2016