Merge branch 'master' of https://github.com/Kotlin/kotlinx.coroutines

Author: hltj

README.md

@@ -161,7 +161,7 @@ to Gradle (in Preferences -> Build, Execution, Deployment -> Build Tools -> Grad
 ### Requirements
 
 * JDK >= 1.8 referred to by the `JAVA_HOME` environment variable.
-* JDK 1.6 referred to by the `JDK_16` environment variable.
+* JDK 1.6 referred to by the `JDK_16` environment variable. It is okay to have `JDK_16` pointing to `JAVA_HOME` for external contributions.
 
 ## Contributions and releases
 

core/kotlinx-coroutines-core/test/guide/example-exceptions-04.kt

@@ -8,7 +8,7 @@ package kotlinx.coroutines.guide.exceptions04
 import kotlinx.coroutines.*
 
 fun main() = runBlocking {
-//sampleEnd
+//sampleStart
     val handler = CoroutineExceptionHandler { _, exception -> 
         println("Caught $exception") 
     }

docs/exception-handling.md

@@ -206,7 +206,7 @@ when its child completes with exception despite the installed handler.
 import kotlinx.coroutines.*
 
 fun main() = runBlocking {
-//sampleEnd
+//sampleStart
     val handler = CoroutineExceptionHandler { _, exception -> 
         println("Caught $exception") 
     }