am 42c2ac00: Merge "Fix for broken docs build."

* commit '42c2ac00e6e6e8fcfd15dcfbc6d70eabc709d904':
  Fix for broken docs build.