rails/rails — pull request #15287 by zzak (2014-05-23 21:00:36+00:00)
Title: Backport 14871

cc #14871