Minor edit. Merging to get us in sync.

@emmaattwell this pull request is just to get your fork fully in sync with the upstream master.