Move I18n fix earlier in the boot process
Merge branch 'master' into rails-3-2

Conflicts:
	config/application.rb