Merge branch 'master' into android

phsource/ph_english_us

@@ -262,7 +262,7 @@ phoneme aI
   IF nextPh(#a) OR nextPh(#o) THEN
     AppendPhoneme(;)
   ENDIF
-  FMT(vdiph/aae)
+  FMT(vdiph/ai_6)
 endphoneme
 
 

phsource/ph_hindi

@@ -44,7 +44,7 @@ phoneme V
     ENDIF
 
     IF prev2PhW(isVowel) AND NOT nextVowel(isFlag1) THEN
-      IF nextPhW(isNotVowel) AND nextPh(isWordEnd) THEN
+      IF thisPh(isFinalVowel) AND nextPhW(isNotVowel) THEN
         // don't delete schwa before a word-final consonant
       ELSE
         ChangePhoneme(NULL)