Merge pull request #2594 from stweil/master