Merge pull request #485 from op-jenkins/op_update_5-25-2016

op-build update 5-25-2016