Merge commit '4ecb536d3e7c54b6460a08fb544620d77193a7d3' * commit '4ecb536d3e7c54b6460a08fb544620d77193a7d3': Try to fix docs build.