Merged r11146 from trunk: Changes for 2.2.1 release.
Changes for 2.2.1 release.
Merged r11126 from trunk (#12744).
Merged r11088 from trunk (#12691).
Merged r11064 from trunk (#12652).
Merged r11140 from trunk to 2.2-stable.
Upgrade to Rails 3.2.11.
Merged r11128 from trunk to 2.2-stable.
Test fails when run at the beginning of the day.
Upgrade to Rails 3.2.11
Deprecation warnings (#12774).
Workaround for #12750.
