Merge branch '5.2.x'

# Conflicts:
#	build.gradle

Author: jhoeller

build.gradle

@@ -65,7 +65,7 @@ configure(allprojects) { project ->
 			dependency "io.reactivex:rxjava-reactive-streams:1.2.1"
 			dependency "io.reactivex.rxjava2:rxjava:2.2.19"
 			dependency "io.reactivex.rxjava3:rxjava:3.0.7"
-			dependency "io.projectreactor.tools:blockhound:1.0.2.RELEASE"
+			dependency "io.projectreactor.tools:blockhound:1.0.4.RELEASE"
 
 			dependency "com.caucho:hessian:4.0.63"
 			dependency "com.fasterxml:aalto-xml:1.2.2"