just to be safe, another case-insensitive comparison
Merge branch 'master' into portable