Merge branch '1.2.x'

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfiguration.java

@@ -106,7 +106,7 @@ public class JacksonAutoConfiguration {
 
 	@Configuration
 	@ConditionalOnClass({ Jackson2ObjectMapperBuilder.class, DateTime.class,
-			DateTimeSerializer.class })
+			DateTimeSerializer.class, JacksonJodaFormat.class })
 	static class JodaDateTimeJacksonConfiguration {
 
 		private final Log log = LogFactory.getLog(JodaDateTimeJacksonConfiguration.class);