Merge pull request #1289 from clehner/master