Restores commits reverted when rails-4.1 branch was merged (#18174).

Patch by Mischa The Evil.

git-svn-id: http://svn.redmine.org/redmine/trunk@13504 e93f8b46-1217-0410-a6f0-8f06a7374b81