Merge svn changes up to r30136