Fix info translation bug
Merge pull request #72 from robintema/master

Fix info translation bug
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' into handlers
Merge branch 'handlers' into dev