rails/rails — pull request #11576 by zzak (2013-07-23 20:14:11+00:00)
Title: backport #11575

#11575
/cc @spastorino