Integrate upstream changes

@chaslemley 

* Integrate upstream changes from jrgifford/delayed_paperclip