keep the rubbish out, please
Merge branch 'master' of github.com:JuhaniImberg/mapserver-merge