Modified older patch submitted by David Horowitz to accommodate more recent changes.
Attach a file by drag & drop or click to upload
