Closes SF bug #583248; backporting to r22-maint branch.
Attach a file by drag & drop or click to upload
