As soon as I hear back from Daniel re the capitalization issue, I roll a new patch based on the latest master.