Merge changes from live system

Martijn van Oosterhoutrequested to merge
kleptog-guest/ddtp:master into master

Here are the changes from ddtp2.debian.net.

Merge request reports