Several fixes (in progress)
- Fixed #742: Bug - Welcome email don't show the correct information
Merge branch 'upstream-master'
Merge branch 'master' into fixes-20130324