Merge remote-tracking branch 'upstream/pull/2049'
[rails.git] / storage / .keep