Don't use smartcase because I make too many typos
Merge remote branch 'origin/master'
Merge branch 'master' into linny