GSIP 91
Merge branch 'master' of git://github.com/geoserver/geoserver