Silence a warning issued by OSX 10.10/Yosemite's system_profiler tool.
Merge branch 'public/7.7' into public/7.8