Original author: @dridi

This commit is from ba78ebeb but
with no analogous file in 6.0, it is added to changes-6.0.rst instead of changes-trunk.rst