allow using unique and unique_with
Merge branch 'case-insensitive-uniqueness'