Collected mappings from SVN r17772.