Issue #143
Merge pull request #144 from geosolutions-it/2.6.x

Issue #143