Supplements #11356 and fixes unit test failures in FF 3.6.
Attach a file by drag & drop or click to upload
