Merge branch 'master' into debian-0.9