Merge pull request #8596 from nnorwitz:nnorwitz
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Fri, 12 May 2017 19:48:28 +0000 (19:48 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Fri, 12 May 2017 19:48:28 +0000 (19:48 +0000)
1  2 
modules/core/src/system.cpp

Simple merge