[andybak]

I didn't make it to the changelog because I had nothing that gave me a sense of whether this was worth digging into.