diff --git a/.gitignore b/.gitignore
index fcf40c453..9c51d709c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,7 @@
 .DS_Store
+*.gcov
+*.gcda
+*.gcno
 *~
 *.o
 *.pyc
@@ -14,6 +17,8 @@ bindings/python/mapnik/paths.py
 config.cache
 config.log
 config.py
+mason_packages/
+.mason/
 .sconf_temp/
 .sconsign.dblite
 demo/viewer/viewer.ini
diff --git a/.travis.yml b/.travis.yml
index 701814480..901b75719 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -44,5 +44,5 @@ script:
  - make
  - git clone --depth=1 https://github.com/mapbox/mapnik-test-data tests/data/mapnik-test-data
  - make test
- - if [[ ${COVERAGE} == true ]]; then cpp-coveralls --build-root . --gcov-options '\-lp' --exclude mason_packages --exclude benchmark --exclude deps --exclude scons --exclude tests --exclude demo --exclude docs --exclude fonts --exclude utils > /dev/null; fi;
+ - if [[ ${COVERAGE} == true ]]; then cpp-coveralls --build-root . --gcov-options '\-lp' --exclude mason_packages --exclude .sconf_temp --exclude benchmark --exclude deps --exclude scons --exclude tests --exclude demo --exclude docs --exclude fonts --exclude utils > /dev/null; fi;
  - if [[ ${COVERAGE} != true ]]; then make bench; fi;
diff --git a/tests/data/json/escaped.geojson b/tests/data/json/escaped.geojson
index 524820af0..0836c2838 100644
--- a/tests/data/json/escaped.geojson
+++ b/tests/data/json/escaped.geojson
@@ -21,10 +21,10 @@
                 "spaces":"this has spaces",
                 "double":1.1,
                 "boolean":true,
-                "NOM_FR":"Québec",
+                "NOM_FR":"Qu\u00e9bec",
                 "object": {"value":{"type":"\u041c\u0430pni\u043a","array": [3,0,"x"]}},
                 "array" : [ [ [1], ["deux"]],[["\u0442\u0440\u0438","four","\u4e94"]]]
             }
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/tests/visual_tests/images/rasterlite-globe-256-256-1.0-agg-reference.png b/tests/visual_tests/images/rasterlite-globe-256-256-1.0-agg-reference.png
index 845ae46df..7c6a1a0ab 100644
Binary files a/tests/visual_tests/images/rasterlite-globe-256-256-1.0-agg-reference.png and b/tests/visual_tests/images/rasterlite-globe-256-256-1.0-agg-reference.png differ
diff --git a/tests/visual_tests/images/rasterlite-globe-256-256-1.0-cairo-reference.png b/tests/visual_tests/images/rasterlite-globe-256-256-1.0-cairo-reference.png
index dea7139e6..bf227400e 100644
Binary files a/tests/visual_tests/images/rasterlite-globe-256-256-1.0-cairo-reference.png and b/tests/visual_tests/images/rasterlite-globe-256-256-1.0-cairo-reference.png differ
diff --git a/tests/visual_tests/images/rasterlite-globe-256-256-2.0-agg-reference.png b/tests/visual_tests/images/rasterlite-globe-256-256-2.0-agg-reference.png
index 845ae46df..7c6a1a0ab 100644
Binary files a/tests/visual_tests/images/rasterlite-globe-256-256-2.0-agg-reference.png and b/tests/visual_tests/images/rasterlite-globe-256-256-2.0-agg-reference.png differ
diff --git a/tests/visual_tests/images/rasterlite-globe-256-256-2.0-cairo-reference.png b/tests/visual_tests/images/rasterlite-globe-256-256-2.0-cairo-reference.png
index dea7139e6..bf227400e 100644
Binary files a/tests/visual_tests/images/rasterlite-globe-256-256-2.0-cairo-reference.png and b/tests/visual_tests/images/rasterlite-globe-256-256-2.0-cairo-reference.png differ