Beginning of Spring fortune test
Merge branch 'master' into fortune
Spring fortune test
Merge branch 'fortune'