Merge "Unbreak documentation build." into jb-mr2-dev