Merge branch 'master' of github.com:mapnik/mapnik

.travis.yml

@@ -31,12 +31,12 @@ matrix:
     - os: linux
       compiler: gcc
       env: JOBS=6
-    - os: osx
-      compiler: clang
-      env: JOBS=8 MASON_PUBLISH=true
-    - os: osx
-      compiler: clang
-      env: JOBS=8 COVERAGE=true
+    #- os: osx
+    #  compiler: clang
+    #  env: JOBS=8 MASON_PUBLISH=true
+    #- os: osx
+    #  compiler: clang
+    #  env: JOBS=8 COVERAGE=true
 
 before_install:
  - export COVERAGE=${COVERAGE:-false}

CHANGELOG.md

@@ -20,12 +20,12 @@ Released: August 12, 2015
 
 #### Summary
 
-- Fixed an issue with fields over size of int32 in OGR plugin (https://github.com/mapnik/node-mapnik/issues/499)
+- Fixed an issue with fields over size of `int32` in `OGR` plugin (https://github.com/mapnik/node-mapnik/issues/499)
 - Added 3 new image-filters to simulate types of colorblindness (`color-blind-protanope`,`color-blind-deuteranope`,`color-blind-tritanope`)
 - Fix so that null text boxes have no bounding boxes when attempting placement ( 162f82cba5b0fb984c425586c6a4b354917abc47 )
 - Patch to add legacy method for setting JPEG quality in images ( #3024 )
-- Added `filter_image` method which can modify an image in place or return a new image that is filtered.
-- Added missing typedef's in mapnik::geometry to allow experiementing with different containers 
+- Added `filter_image` method which can modify an image in place or return a new image that is filtered
+- Added missing typedef's in `mapnik::geometry` to allow experimenting with different containers
 
 ## 3.0.2