Merge debian branch (r2860).