rails/rails — pull request #15292 by zzak (2014-05-23 23:56:08+00:00)
Title: Backport 43f5250

cc 43f5250 @rafaelfranca