Another go at cpuid.
Merge branch 'v0.36'