Revise polyglossia fix (#121,#127)
Revise polyglossia fix (#121,#127)
Merge branch 'dev' into ms