Before W64 merge
Merge branch 'master' for W64 build compatibility
Fixing for size_t print differences between GNU and MSC