Merge pull request #1 from spring-projects/master

Please ignore this particular merge request - caused by happy button clicking - I do have a fix for ROO-3500, but I will clone a new branch and request a merge from there instead.