rails/rails — pull request #15289 by zzak (2014-05-23 21:53:09+00:00)
Title: Future port c8ddb61

cc c8ddb61
@rafaelfranca