Set some debug-output-variables to previous values.
Merge branch 'master' of https://github.com/JuhaniImberg/mapserver-merge