Moderator

I know you prefer separate pull requests, but I think the StopIteration error fix is small and uncontroversial enough to be here as well.