This is basically the same patch as I sent a while ago but it'll apply to the current master branch without issue. Hopefully this one will actually get pushed now since there isn't a mountain of patches before it. -- Callan Barrett