Treat .edts-files better
Merge branch 'master' into advice-fix-cntd
Make sure that file-name is non nil