Backport opam dose patches

Or does this deserve a `dose.3.1.2+opam` package release ?