config update
Merge branch 'rails_4.1'