Merge branch 'release/1.1' into develop
Fixing sphinx import path
Merge branch 'develop'