Merge commit 'b9b97ba6526aebbe920e0bd29b8dc8dc35267cfc' into harfbuzz

Conflicts:
	src/load_map.cpp

docs/contributing.markdown

@@ -153,6 +153,14 @@ If you see bits of code around that do not follow these please don't hesitate to
         // more...
     }
 
+#### Prefer `empty()` over `size() == 0` if container supports it
+
+This avoids implicit conversions to bool and reduces compiler warnings.
+
+    if (container.empty()) // please
+
+    if (container.size() == 0) // no
+
 
 ### Other C++ style resources
 

tests/data/csv/fails/unix_newlines_with_windows_inline.csv

@@ -0,0 +1,7 @@
+x,y,line
+0,0,"
+  many
+  lines
+  of text
+  with unix newlines
+  "

tests/data/csv/fails/unix_newlines_with_windows_inline_escaped.csv

@@ -0,0 +1,2 @@
+x,y,line
+0,0,"\r\nmany\r\nlines\r\nof text\r\nwith unix newlines\r\n"

tests/data/csv/mac_newlines_with_unix_inline.csv

@@ -0,0 +1,7 @@
+x,y,line
+0,0,"
+  many
+  lines
+  of text
+  with unix newlines
+  "

tests/data/csv/mac_newlines_with_unix_inline_escaped.csv

@@ -0,0 +1,2 @@
+x,y,line
+0,0,"many\n  lines\n  of text\n  with unix newlines"

tests/data/csv/windows_newlines_with_unix_inline.csv

@@ -0,0 +1,7 @@
+x,y,line
+0,0,"
+  many
+  lines
+  of text
+  with unix newlines
+  "

tests/data/csv/windows_newlines_with_unix_inline_escaped.csv

@@ -0,0 +1,2 @@
+x,y,line
+0,0,"many\n  lines\n  of text\n  with unix newlines"

tests/python_tests/csv_test.py

@@ -6,6 +6,8 @@ from nose.tools import *
 from utilities import execution_path
 
 import os, mapnik
+# make the tests silent since we intentially test error conditions that are noisy
+mapnik.logger.set_severity(mapnik.severity_type.None)
 
 def setup():
     # All of the paths used are relative, if we run the tests