(Backport of 2bbcde1d with the fix b698aec2 squashed in) doc fixes #2107
Attach a file by drag & drop or click to upload