Merge "Change name of Tahitian language"