Merge svn change r31315