Merge branch 'fix-content-type'