rails/rails — pull request #14078 by gsamokovarov (2014-02-16 23:21:52+00:00)
Title: Backport #13512 to 4.0 stable

This backports #13512 to the `4-0-stable` branch.