Merge branch 'master' into debian
New upstream version