Added content-codings data
auto-merge staging into master