This incorporates security fixes from Alan that I brought from the 2.4.20-pre9 tree.
Attach a file by drag & drop or click to upload
