Zubin authored Jun 09, 2020 and Marge Bot committed Jun 25, 2020

This lets us reuse these functions in haddock, avoiding synchronization bugs.

Also fixed some divergences with haddock in that file

Updates haddock submodule