Merge branch 'ben' into docs-next

Ben writes: "This series fixes some bugs I found in the new doc build system."