Merge pull request #454 from op-jenkins/op_update_4-29-2016

op-build update 4-29-2016