merged changes from glottologcurator