Merge branch 'master' into py37-by-default

.travis.yml

@@ -55,7 +55,7 @@ jobs:
       python: '3.4'
     - env: TOXENV=py36
       python: '3.6'
-    - env: TOXENV=linting,docs,doctesting PYTEST_NO_COVERAGE=1
+    - env: TOXENV=linting,docs,doctesting
       python: '3.7'
 
     - stage: deploy
@@ -89,8 +89,8 @@ after_success:
   - |
     if [[ "$PYTEST_NO_COVERAGE" != 1 ]]; then
       set -e
-      # Add first TOXENV to $PATH.
-      PATH="$PWD/.tox/${TOXENV%%,*}/bin:$PATH"
+      # Add last TOXENV to $PATH.
+      PATH="$PWD/.tox/${TOXENV##*,}/bin:$PATH"
       coverage combine
       coverage xml --ignore-errors
       coverage report -m --ignore-errors