Merge pull request #613 from rbs-maugier/master

[Fix]I18n Geo
[Fix]I18n Order

[Fix]Fix #600