Merge "Fix docs build." into gingerbread