Merge branch 'branch-1.2' into debian