ticket/master/pup 2907

Since Josh is out, I'm resubmitting his pull with the comma that offended ruby 1.8.7 removed :)