Various bits mostly from 2.4 Also fix indentation of various entries to match the rest of the file.
Attach a file by drag & drop or click to upload
