Add missing "-" to list of allowed chars in media filenames
Merge commit '284fc0b' into merge2