Changes corresponding to Hydra documentation commit 6e1e175.