This fix will need to be backported to stable too, but we want the
testing images to be built on master, as other requirements
(specifically doc building) have changed.