Filename sanitization
Merge remote-tracking branch 'cm/master'