Since @tenderlove is busy preparing for talks I'll merge and fix this bug