v1.13.1: bug #769 Fix looking for keywords (nicolas-grekas)

This PR was merged into the 1.12-dev branch.

Discussion
----------

Fix looking for keywords

Fix #768

Commits
-------

9f47b85 Fix looking for keywords