This will now need to go into 1.6.rst