Another attempt to fix cpuid.
Merge branch 'v0.36'