Merge pull request #11757 from freiling:master
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 25 Jun 2018 12:53:07 +0000 (12:53 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 25 Jun 2018 12:53:07 +0000 (12:53 +0000)
1  2 
modules/core/src/system.cpp

Simple merge