Merged r11146 from trunk: Changes for 2.2.1 release.
Authored by: jplang 2013-01-09
Parent: [r11146]
Child: [r11148]
