Broken gitignore caused missed files
Merge branch 'master' into debian
New upstream version