urgent mail fix
Merge remote-tracking branch 'upstream/wikirate' into wikirate