Merge pull request #2556 from peterfromearth/issue2474