Merge pull request #749 from phil-davis/master
Reorder reverse lookup overrides so user-specified ones are effective
Merge pull request #749 from phil-davis/master
Reorder reverse lookup overrides so user-specified ones are effective