Merge pull request #472 from danvk/right-edge