toupper, not std::toupper
Merge branch 'master' into appveyor-publish