upgrade RSVP
Merge pull request #3015 from stefanpenner/ugprade_rsvp

upgrade RSVP