NaN update from Alex
Merge branch 'master' of https://github.com/spring-projects/toolsuite-distribution
Move Kris's Gradle updates above the Misc Updates section.