Merge pull request #9580 from mshabunin:fix-static-6
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Sat, 9 Sep 2017 19:31:21 +0000 (19:31 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Sat, 9 Sep 2017 19:31:21 +0000 (19:31 +0000)
1  2 
modules/core/src/system.cpp

Simple merge