Merge pull request #10893 from alalek:fix_cpu_disable_flags
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 19 Feb 2018 14:11:11 +0000 (14:11 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 19 Feb 2018 14:11:11 +0000 (14:11 +0000)

Trivial merge