Merge svn changes up to r27347