Merge "Fix apidoc builds"