* all: Patches by Loren Merritt: