Merge branch 'master' into debian
dh 9
git ignore debian build debris