Improved content-type guessing
Merge branch 'origin/master'