merge v2.50

Author: john-terraspace

.travis.yml

@@ -1,7 +1,24 @@
+matrix:
+  include:
+    # works on Precise and Trusty
+    - os: linux
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+            - llvm-toolchain-precise-3.8
+          packages:
+            - clang-3.8
+      env:
+        - MATRIX_EVAL="CC=clang-3.8 && CXX=clang++-3.8"
+
+before_install:
+    - eval "${MATRIX_EVAL}"
+
 language: c
 compiler:
-  - gcc
-script: make -f GccUnix.mak
+  - clang
+script: make -f Makefile_Linux
 deploy:
   provider: s3
   access_key_id: $SKEY