Merge branch '1.1.x'

spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/HttpMessageConvertersAutoConfigurationTests.java

@@ -66,7 +66,7 @@ public class HttpMessageConvertersAutoConfigurationTests {
 	protected static class JacksonConfig {
 
 		@Bean
-		public MappingJackson2HttpMessageConverter jacksonMessaegConverter() {
+		public MappingJackson2HttpMessageConverter jacksonMessageConverter() {
 			MappingJackson2HttpMessageConverter converter = new MappingJackson2HttpMessageConverter();
 			converter.setObjectMapper(objectMapper());
 			return converter;