Merge svn changes up to r31244