Merge branch '0.4.x' into 1.0.x

Closes gh-1097

Author: jgrandja

README.adoc

@@ -80,7 +80,7 @@ Discover more commands with `./gradlew tasks`.
 
 == Getting Support
 Check out the https://stackoverflow.com/questions/tagged/spring-security[Spring Security tags on Stack Overflow].
-https://spring.io/services[Commercial support] is available too.
+https://spring.io/support[Commercial support] is available too.
 
 == Contributing
 https://help.github.com/articles/creating-a-pull-request[Pull requests] are welcome; see the link:CONTRIBUTING.adoc[contributor guidelines] for details.