Upgrade to Spring Boot 1.0.0.RELEASE
Merge remote-tracking branch 'upstream/master'
Spring Boot 1.0.0