fix linking on windows - accidentally broken in 8b5323f101ab3 (restores fix from 03d8b6d9d7)
tests: fix clipping test on windows by stripping newlines
Merge branch '2.3.x' of https://github.com/mapnik/mapnik into 2.3.x