Merge pull request #2346 from trenkel/master