Merge branch 'sb/filenames-with-dashes'