Colleced mappings from SVN r16348.
Prepare for release r1.2.