Change 'passwd' option to 'password' for /join command
Merge branch 'master' into gmail