Add option to avoid lowercasing
Merge pull request #951 from andrerod/dev

Reapply storage fixes
Merge branch 'release-0.7.13' into storage