Merge debian branch (r2854).