Dev version.
Check Content-Type, do not panic on bad version.
Merge branch 'develop'
Master version.