Upgraded to Spring Boot 1.2