Return different Content-Type
Merge branch 'develop'