case insensitive lookups
Merge branch 'development' into edx