cb9576b10e
Conflicts: source/firm.c source/firm.h source/patches.c source/patches.h
Conflicts: source/firm.c source/firm.h source/patches.c source/patches.h