Finally got around to committing this; thanks, Torsten.  As a reward, I'm going to make you nosy on a new, related issue I'm about to create.  It is, of course, your option whether you want to work on it :)

By the way, have you submitted a contributor agreement?  This patch isn't really big enough to require one, but having one on file is always a good idea, especially if you are going to keep contributing (and I hope you do).