Merge pull request #2558 from waterson/pr-2554