Hi Steve,
I like this patch much better than the last. It's ok with me, but you might want give 24 hours to let the world rotate before committing (ie., allow others to comment)
Committed as r253768. Thanks for the review!
I don't think it is worth backporting, so I'll close
the bug. If somebody thinks that we should indeed backport,
please let me know.
Regards
Thomas
