Fix test failing on newer versions of click.
Merge branch 'master' into issue-23