Merge commit '4634aa43a5' into development

Conflicts:
	dictsource/dict_phonemes
	phsource/compile_report
	phsource/vdiph/eei_5
	phsource/vdiph2/i@_3
	phsource/vietnam/_c.wav
	phsource/vietnam/a
	phsource/vietnam/ch.wav
	phsource/vietnam/dd.wav
	phsource/vietnam/ie_2
	phsource/vietnam/oe
	phsource/vietnam/th.wav
	phsource/vietnam/tr.wav
	platforms/windows/make_espeakedit.iss
	src/Makefile

phsource/ph_portugal

@@ -134,11 +134,6 @@ endphoneme
 
 
 
-phoneme R    // for Portugal this is same the as [r]
-  import_phoneme pt/r
-endphoneme
-
-
 phoneme s#     // This is [s] for Brazil, [S] for Portugal
   CALL base/S
   ipa ʃ