Merging with my last svn version.