Reintegrate Hannover.pm branch