add strtok_r for Windows compiling
Merge remote-tracking branch 'upstream/master'