[1.47.07c]

git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@348 d46cf337-b52f-0410-862d-fd96e6ae7743
Merge branch 'upstream' into development

Conflicts:
	dictsource/dict_phonemes
Merge branch 'development'