Collected mappings from SVN r17324.