# This is a combination of 2 commits.
# The first commit's message is:

Merge branch 'master' of github.com:geoserver/geoserver

# This is the 2nd commit message:

fixing tests in WCS due to change in mime type for geotiff encoder
 - #GEOS-6275
Merge branch 'master' of https://github.com/afabiani/geoserver