Merge pull request #1289 from trenkel/master