Merging in Spring Boot pull req from Josh Long