Import SVN revision 6