- Fixed #742: Bug - Welcome email don't show the correct information
Merge branch 'upstream-master'