Apply SVN r3730