Merged svn branch.