Merge pull request #1890 from trenkel/master