Minor changes for sphinx
Merge from github