This is the sort of patch where I suspect I won't get any feedback until it breaks something. And since it's not breaking anything on the OSes at my disposal and it's DWIMming, I applied it in r30366.
I'll resolve ticket in a few days if there are no complaints. Thank you very much. kid51
