Merge branch 'branch-1.3' into debian