Update to work with paperclip 4.1