Merge pull request #15097 from komakai:no_samples_build-option
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Mon, 22 Jul 2019 17:38:37 +0000 (17:38 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Mon, 22 Jul 2019 17:38:37 +0000 (17:38 +0000)

Trivial merge