manually merged Buu's work into the trunk