Merge request: http://users.puzzling.org/users/mary/bzr/planet/branches/executable-tests/

[Mary Gardiner]

> > It should apply directly after
> > http://users.puzzling.org/users/mary/bzr/planet/branches/original-url-tracking/
> 
> (btw, this branch was not independent of your previous 'retain original URL'
> one. no biggie, 'cos i'm going to merge both anyway.)

No it wasn't. I couldn't be bothered, because then there's need to be a
third "fix up the tests added by the retain branch" branch.

-Mary