Merge pull request #2643 from stweil/master