Merge pull request #486 from op-jenkins/op_update_5-27-2016

op-build update 5-27-2016