Merge branch 'branch-1.1' into debian