Rails 3.2.21 upgrade
Merge branch 'master' into bump_version_of_wysihtml5