Merge pull request #5612 from rrooij/southparknl