Merge branch 'master' (v0.9.6.2) into debian