Merge branch 'branch-1.9' into debian