Fixed auto invite from guild.
Return back pre 5.4.1 code for guild.
Merge remote-tracking branch 'm/master'