Merge in latest from i18next:master