cosmetic, caching
oops
removed 2.6 compatibility
Merge pull request #1 from vindolin/development

Development