Merge branch 'master' into scalariform

Author: analytically

.travis.yml

@@ -8,21 +8,8 @@ scala:
 env:
 - JDK=oraclejdk8
 - JDK=openjdk8
-- JDK=openjdk7
-addons:
-  # https://github.com/travis-ci/travis-ci/issues/5227#issuecomment-165131913
-  hosts:
-    - scala-logging
-  hostname: scala-logging
 before_script:
   - jdk_switcher use $JDK
 script:
 - sbt "++ ${TRAVIS_SCALA_VERSION}!" test
-- git diff --exit-code # check scalariform
-matrix:
-  # scala 2.12 and 2.13 require java 8
-  exclude:
-    - scala: 2.12.4
-      env: JDK=openjdk7
-    - scala: 2.13.0-M2
-      env: JDK=openjdk7
+- git diff --exit-code # check scalariform