Merged from Mangosbot