From https://github.com/pcreux/paperclip/commit/52374958ef83f1641cf008aead27c23b25fb842d

Conflicts:

	lib/paperclip/attachment.rb