Resolve merge.
Repairs for documentation build.