Merge pull request #890 from trenkel/master