Missed a few (GSIP-118)
Merge branch 'master' of git://github.com/geoserver/geoserver