Port a bugfix from DesertBot
Merge git://github.com/Heufneutje/PyHeufyBot