Merge pull request #2644 from stweil/master