Merge svn changes up to r29412