Apply Trimou 1.6.0
Merge branch 'trimou' of https://github.com/Pitzcarraldo/spring-mustache-hogan-example into trimou