fix for https://jira.spring.io/browse/SPR-11498
Merge remote-tracking branch 'origin/master'