Merge branch 'upstream' into development

Conflicts:
	dictsource/dict_phonemes
	phsource/compile_report

dictsource/fr_rules

@@ -698,7 +698,7 @@ _quatrevin) gts (_ z2
      _) game (X    _^_en
         girl       _^_en     // girl
         gh (K		_^_en
-        gy (_      _^_en
+     @) gy (_      _^_en
 
 
 .group h
@@ -1497,7 +1497,7 @@ A)        wn        _^_en
         y (nn      i
 
 // group y: English section
-_C)	y (_	_^_en
+//_C)	y (_	_^_en
 AC)	y (_	_^_en
 C)	y (e_	_^_en
 %C)	y (_	_^_en