Merge branch 'branch-1.6' into debian