Merge branch '3.1.x'

.gitignore

@@ -15,3 +15,4 @@ org.springframework.spring-parent/.classpath
 org.springframework.spring-parent/.project
 org.springframework.test/test-output/
 target
+spring-build/lib/docbook

org.springframework.beans/src/main/java/org/springframework/beans/TypeConverterDelegate.java

@@ -244,7 +244,7 @@ class TypeConverterDelegate {
 		}
 
 		if (firstAttemptEx != null) {
-			if (editor == null) {
+			if (editor == null && convertedValue == newValue) {
 				throw firstAttemptEx;
 			}
 			logger.debug("Original ConversionService attempt failed - ignored since " +