Sync with thymeleaf 2.1.1