Merge branch 'upstream' into development

Conflicts:
	dictsource/dict_phonemes

phsource/ph_bengali

@@ -17,8 +17,11 @@ phoneme V  // inherent vowel, can be [O] or [o]
       ChangePhoneme(o)
     ENDIF
     
-    IF prevPhW(r) THEN
-      ChangePhoneme(o)
+    IF prevPhW(r) AND nextVowel(isVowel) THEN
+      IF nextVowel(isWordEnd) AND nextVowel(V) THEN
+      ELSE
+        ChangePhoneme(o)
+      ENDIF
     ENDIF  
   ENDIF
 

phsource/ph_portugal

@@ -113,7 +113,7 @@ endphoneme
 phoneme U
   vowel starttype #u endtype #u
   length 130
-  IF nextPh(isVowel) THEN
+  IF thisPh(isWordEnd) AND thisPh(isAfterStress) AND nextPh(isVowel) THEN
     ChangePhoneme(w)
   ENDIF
   FMT(vowel/u_6)

phsource/ph_pt_brazil

@@ -135,7 +135,7 @@ endphoneme
 phoneme U
   vowel starttype #u endtype #u
   length 140
-  IF thisPh(isWordEnd) AND nextPh(isVowel) THEN
+  IF thisPh(isWordEnd) AND thisPh(isAfterStress) AND nextPh(isVowel) THEN
     ChangePhoneme(w)
   ENDIF
   FMT(vowel/uu_bck)