Merge branch 'master' of https://github.com/paivola/mapserver
Merge branch 'master' of https://github.com/JuhaniImberg/mapserver-merge