1.31: fix RT#85244, Changes.pod patch by Gregor Hermann