Pull in partial changes from HEAD
Merge branch 'cygwin64' into msys2-64-dev
Revert moving scan_suffix class to header