Track my fork of rails 3.2
Merge branch 'master' into fix-build