Change '传真' to '邮箱'.
Change '传真' to '邮箱'.
Merge origin/master