WIP, part of Bug 1025805 - multiple referrers over time
Merge pull request #14 from adamlofting/bug1025805

Part of Bug 1025805 - multiple referrers over time