Merge latest CVS patches into one