Upgraded to Thymeleaf v 2.1