Upgrade from Rails 3.2.14 to 3.2.16.
Merge branch 'master' into messaging-system