Merge git://hammerboy.no-ip.org/eventmanager