Merge pull request #688 from Wedmer/master