Merge pull request #1506 from mfournier/apache-content-type-1170