ad hoc redirects. Some judgement calls. Fixes #960.
Merge pull request #967 from afred/one-off-redirects-960

ad hoc redirects. Some judgement calls. Fixes #960.