Should be less controversial than my first version of this patch. If anyone would like to have the doctest updated, please send a follow-up patch (IMHO, I think it doesn't really matter to update the doctest for this).