merging d6a9ade1efe91e570a3d2518b1683e69a60d4692 on i18n, which somehow got lost