Merge pull request #491 from danvk/legend-never