Merge back in Mr. Whale's manual merge.