Merge branch 'upstream' into development

Conflicts:
	dictsource/dict_phonemes

phsource/ph_english_us

@@ -143,7 +143,7 @@ endphoneme
 phoneme A:
   vowel  starttype #a  endtype #a
   length 200
-  IF nextPh(r) THEN
+  IF nextPhW(r) THEN
     FMT(vwl_en_us/ar)
   ENDIF
   FMT(vowel/aa_8)
@@ -183,7 +183,7 @@ phoneme O:
   vowel  starttype #o  endtype #o
   length 200
   ChangeIfDiminished(@)
-  IF nextPh(r) THEN
+  IF nextPhW(r) THEN
     FMT(vwl_en_us/oor)
   ENDIF
   FMT(vowel/0_3)

phsource/ph_malayalam

@@ -15,7 +15,7 @@ phoneme y  // epenthetic vowel
   unstressed
   ipa ɨ
   length 80
-  FMT(vowel/u#_4, 80)
+  FMT(vowel/u#_4, 120)
 endphoneme
 
 

phsource/phonemes

@@ -1949,4 +1949,3 @@ include ph_korean
 
 phonemetable kl base
 include ph_greenlandic
-