Merge changes from 2.x test branch to master.

The `requirements.txt` file seems to help.