Needs to be backported to 2.6 and forward ported to 3.0 and 3.1.
Attach a file by drag & drop or click to upload
