Merge remote-tracking branch 'origin/master' into develop
diff --git a/coroutines-guide.md b/coroutines-guide.md
index 9267efd..4a7fb67 100644
--- a/coroutines-guide.md
+++ b/coroutines-guide.md
@@ -77,7 +77,7 @@
* <a name='imperative-finally-block'></a>[Imperative finally block](docs/flow.md#imperative-finally-block)
* <a name='declarative-handling'></a>[Declarative handling](docs/flow.md#declarative-handling)
* <a name='upstream-exceptions-only'></a>[Upstream exceptions only](docs/flow.md#upstream-exceptions-only)
- * <a name='imperative-versus-declarative'></a>[Imperative versus declarative](docs/flow.md#imperative-versus-declarative)
+ * <a name='imperative-versus-declarative'></a>[Imperative versus declarative](docs/flow.md#imperative-versus-declarative)
* <a name='launching-flow'></a>[Launching flow](docs/flow.md#launching-flow)
<!--- TOC_REF docs/channels.md -->
* <a name='channels'></a>[Channels](docs/channels.md#channels)
diff --git a/docs/shared-mutable-state-and-concurrency.md b/docs/shared-mutable-state-and-concurrency.md
index 48d3d70..30d7334 100644
--- a/docs/shared-mutable-state-and-concurrency.md
+++ b/docs/shared-mutable-state-and-concurrency.md
@@ -501,7 +501,7 @@
}
//sampleStart
-fun main() = runBlocking {
+fun main() = runBlocking<Unit> {
val counter = counterActor() // create the actor
withContext(Dispatchers.Default) {
massiveRun {
diff --git a/kotlinx-coroutines-core/jvm/test/guide/example-sync-07.kt b/kotlinx-coroutines-core/jvm/test/guide/example-sync-07.kt
index 49f0701..65e2050 100644
--- a/kotlinx-coroutines-core/jvm/test/guide/example-sync-07.kt
+++ b/kotlinx-coroutines-core/jvm/test/guide/example-sync-07.kt
@@ -40,7 +40,7 @@
}
}
-fun main() = runBlocking {
+fun main() = runBlocking<Unit> {
val counter = counterActor() // create the actor
withContext(Dispatchers.Default) {
massiveRun {