set content type even if we use apache to serve the file
Merge branch 'master' into debian