Merge remote-tracking branch 'upstream/pull/2225'
[rails.git] / public / google642dc7d1c31aa8b2.html