Merged from MangosBot