Merging in all the latest changes from SVN.