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

Author: artemp

.travis.yml

@@ -56,7 +56,6 @@ before_install:
  - |
    if [[ $(uname -s) == 'Linux' ]]; then
      export LDSHARED=$(python -c "import os;from distutils import sysconfig;print sysconfig.get_config_var('LDSHARED').replace('cc ','clang++-3.8 ')");
-     mason install clang 3.8.0
      ./.mason/mason install clang 3.8.0
      export PATH=$(./.mason/mason prefix clang 3.8.0)/bin:${PATH}
      which clang++

scripts/setup_mason.sh

@@ -4,7 +4,7 @@ set -eu
 set -o pipefail
 
 # we pin the mason version to avoid changes in mason breaking builds
-MASON_VERSION="better-linking"
+MASON_VERSION="3ddc419"
 
 function setup_mason() {
     if [[ ! -d ./.mason ]]; then