Fix structuring of nested generics, add test#688

Tinche merged 2 commits into

python-attrs:mainpython-attrs/cattrs:mainfrom

calebj:fix_nested_genericscalebj/cattrs:fix_nested_genericsCopy head branch name to clipboard