rails/rails — pull request #14581 by thedarkone (2014-04-03 14:16:47+00:00)
Title: Backport #14532 into 4-1-stable

Since #14532 was a bug fix, backport it into `4-1-stable`.