MInor fixups
Merge branch 'develop' of github.com:hyperoslo/rope-pull into develop