Merge remote-tracking branch 'origin/master'

*Variants labelled (experimental) are still undergoing testing; if they have failed it may be a bug in OCaml-CI.