4ac6c0c3ee
Not sure how this managed to fall out of master -- some of these fixes are five days old, and should certianly have been merged in prior to just now.