Merge branch 'release/0.6.0' into develop
Doc fix.
Merge branch 'develop' into hotfix/0.6.1
Fixing an issue where cursors weren't handling inheritance. Need to make the cursor code more integrated.
Merge branch 'hotfix/0.6.1'