Merged spring-hateoas branch