[GEOS-6491], alternative approach that does not break the build
Merge branch 'master' of git://github.com/geoserver/geoserver