Merge pull request #8437 from Razzeee/fix-content-types
authorRazzeee <razzeee@gmail.com>
Tue, 1 Dec 2015 16:18:55 +0000 (17:18 +0100)
committerRazzeee <razzeee@gmail.com>
Tue, 1 Dec 2015 16:18:55 +0000 (17:18 +0100)
Fix content types. Fixes #16392


Trivial merge