Merge pull request #449 from seuros/master

Improve migration/upgrade instructions
Remove I18n Deprecation warning in tests.