Back to track upstream mapnik-reference (has a 2.1.1 section now)
Tweak a test to use regexp (carto master slightly changed errors)