Merge "Fix for broken docs build."