Merge branch 'branch-1.5' into debian