some more work on supporting recursive descriptors properly
Merge branch 'master' of github.com:DRMacIver/hypothesis