Merge "Bug fix for readTheDocs"