Statement incorrectly assumes that trailing DS from user always equals system DS
Merge pull request #1601 from WooDzu/1.2.5-local

[PR] LoaderTest::testsEvents() fails on windows
Merge remote-tracking branch 'upstream/1.2.5' into QA-valgrind-1.2.5