More attempts to assure unicode file names are properly cleaned
Merge commit 'cb4857b8f0e1c7461847601901efbb706bbbfe5c' into HEAD