Fix typo
Merge branch 'rails-4-0-1' into gh-pages