Fixed i18n plugin and setting locale from query parameter
Merge remote-tracking branch 'origin/master'