Merge commit 'cworth/master' into dfsg-debian