Merge branch 'master' into 'initcmd'

# Conflicts:
#   debian/postinst
1 job for initcmd in 18 seconds (queued for 1 second)
latest