getting ready for farming
Merge branch 'master' of github.com:/JuhaniImberg/mapserver-merge