Once I see how the buildbots react, I'll backport this to 2.4.
Attach a file by drag & drop or click to upload
