Re: #1131: unblock haddock in dist-f11