Bugfix release.
Merge branch 'master' into debian
Changelog update.