Peter Herweg's RTF patches applied--note the RTFHandler update was missing, added similar changes as was done to the MIFHandler.