The attached patch applied successfully for me against trunk at rev. 111221.