fixed content type
Merge branch 'master' into develop