Merge branch 'case-insensitive-username'