Initial support for user preferences and fix for GeoServer
Merge remote-tracking branch 'origin/master'