Merge pull request #10852 from alalek:fix_cpuid
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 13 Feb 2018 13:56:22 +0000 (13:56 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 13 Feb 2018 13:56:22 +0000 (13:56 +0000)

Trivial merge