Merge branch 'branch-1.8' into debian