Added error message for incorrect media type
Merge branch 'master' into clientjs