Merge pull request #481 from op-jenkins/op_update_5-19-2016

op-build update 5-19-2016