Reenable Cairo and grid tests.
+ check if geometry record (WKB) is not Null before attempting to parse
+ log Null geometry case ( via @TomH )
+ fix accidental typo :)
Merge branch 'master' of github.com:mapnik/mapnik into static-plugins
disable compiling the c++ benchmark by default
remove expression_grammar from public api
rename css_color_grammar_def.hpp -> css_color_grammar_impl.hpp to be consistent with other headers
move expresion_grammar impl to impl header
rollback MAPNIK_DECL on exceptions - which breaks linking of python bindings on msvc - refs #1826
remove uneeded exception translator for mapnik::config_error - works around #1847
+ move to QT 5.x (requirement!)
scons: disable cairo support at configure time unless cairo reports freetype support - closes #1842
further improve cairo freetype support checking - refs #1842
remove debug output
Merge branch 'master' of github.com:mapnik/mapnik into static-plugins