Merge branch 'branch-1.7' into debian