Fix non-generic protocols#436

Tinche merged 2 commits intomainpython-attrs/cattrs:mainfrom

tin/non-generic-protocolspython-attrs/cattrs:tin/non-generic-protocolsCopy head branch name to clipboard