more fix for ReadTheDocs
Fixing ReadTheDocs

* 2.1:
  more fix for ReadTheDocs