Upgrade to Thymeleaf 2.1.2