Merge pull request #1019 from Speedy64i/edge