Merge pull request #480 from op-jenkins/op_update_5-18-2016

op-build update 5-18-2016