Merge branch 'release-0.13' into debian-develop