Merge branch '1.3.x' into 1.4.x

spring-boot-samples/spring-boot-sample-web-groovy-templates/src/main/resources/templates/layout.tpl

@@ -8,7 +8,7 @@ html {
       div(class:'navbar') {
         div(class:'navbar-inner') {
           a(class:'brand',
-              href:'http://groovy-lang.org/404.html') {
+              href:'http://docs.groovy-lang.org/docs/latest/html/documentation/markup-template-engine.html') {
               yield 'Groovy - Layout'
           }
           ul(class:'nav') {