Reenable use of generics enabled socket stuff.
Merge branch 'release/0.7.0'