Avoid double spaces in error messages to get same messages on Windows and Unix
Merge pull request #473 from dbabokin/win_test

Avoid double spaces in error messages to get same messages on Win and Unix