Get documentation to build.
Merge remote-tracking branch 'upstream/trunk' into fq