Applied Rick Manelius' patch to calendar module.