Merged svn-support into master.