rails/rails — pull request #14327 by zzak (2014-03-08 18:47:04+00:00)
Title: Backport a94966e

From #14244