Merge debian branch (r2710).