Merge pull request #1413 from tewe/master