See the individual commit messages.
Signed-off-by: Philip Withnall pwithnall@endlessos.org
Helps: #1415