Merge remote-tracking branch 'upstream/pull/2207'
[rails.git] / config / settings / production.yml