FIX: Typo
FIX: Typo
Merge pull request #2683 from blagarde/master

FIX: Typo
FIX: Typos
Merge pull request #2684 from blagarde/master

FIX: Typos
FIX: test failure under windows caused by temp files handling