Merge branch 'master' into test_pypy3

Author: altendky

.travis.yml

@@ -1,11 +1,11 @@
 language: python
-sudo: false
+os: linux
 cache: pip
 env:
   global:
     - LD_PRELOAD=/lib/x86_64-linux-gnu/libSegFault.so
     - SEGFAULT_SIGNALS=all
-matrix:
+jobs:
   include:
     - python: '3.6'
       env:
@@ -44,6 +44,13 @@ install:
         export TOXPYTHON=$(echo $HOME/pypy3*/bin/pypy3)
     fi
     set +x
+  - |
+    set -ex
+    if [[ $TOXENV == 'check' ]]; then
+        (gem install travis --no-rdoc --no-ri
+         travis lint --no-interactive --exit-code)
+    fi
+    set +x
 script:
   - tox -v
 after_failure: