Merge branch '2.x' into fix-matchers-test

Author: nhaarman

.travis.yml

@@ -4,21 +4,21 @@ language: java
 
 matrix:
   include:
-  - jdk: oraclejdk8
+  - jdk: openjdk8
     env: TERM=dumb MOCK_MAKER=mock-maker-inline KOTLIN_VERSION=1.0.7
-  - jdk: oraclejdk8
+  - jdk: openjdk8
     env: TERM=dumb MOCK_MAKER=mock-maker-inline KOTLIN_VERSION=1.1.61
-  - jdk: oraclejdk8
+  - jdk: openjdk8
     env: TERM=dumb MOCK_MAKER=mock-maker-inline KOTLIN_VERSION=1.2.50
-  - jdk: oraclejdk8
+  - jdk: openjdk8
     env: TERM=dumb MOCK_MAKER=mock-maker-inline KOTLIN_VERSION=1.3.40
-  - jdk: oraclejdk8
+  - jdk: openjdk8
     env: TERM=dumb KOTLIN_VERSION=1.0.7
-  - jdk: oraclejdk8
+  - jdk: openjdk8
     env: TERM=dumb KOTLIN_VERSION=1.1.61
-  - jdk: oraclejdk8
+  - jdk: openjdk8
     env: TERM=dumb KOTLIN_VERSION=1.2.50
-  - jdk: oraclejdk8
+  - jdk: openjdk8
     env: TERM=dumb KOTLIN_VERSION=1.3.40