Merge branch '5.2.x'

# Conflicts:
#	build.gradle

spring-context/src/main/java/org/springframework/validation/BindException.java

@@ -229,6 +229,7 @@ public class BindException extends Exception implements BindingResult {
 	}
 
 	@Override
+	@Nullable
 	public Object getTarget() {
 		return this.bindingResult.getTarget();
 	}

spring-context/src/main/java/org/springframework/validation/MapBindingResult.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * Copyright 2002-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,6 +19,7 @@ package org.springframework.validation;
 import java.io.Serializable;
 import java.util.Map;
 
+import org.springframework.lang.NonNull;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 
@@ -52,11 +53,15 @@ public class MapBindingResult extends AbstractBindingResult implements Serializa
 	}
 
 
+	/**
+	 * Return the target Map to bind onto.
+	 */
 	public final Map<?, ?> getTargetMap() {
 		return this.target;
 	}
 
 	@Override
+	@NonNull
 	public final Object getTarget() {
 		return this.target;
 	}