Merge pull request #117 from sondinhinfectious/master

Discovery: Treat empty nextPageToken field the same as it not existing.