Merge branch 'branch-1.4' into debian