update from Joerg Jenderek
Patch for acronis (Joerg Jenderek)
Use more the dos filename function (Joerg Jenderek)
Merge remote-tracking branch 'upstream/master'
merge with upstream