Merge pull request #9217 from alalek:cleanup_3rdparty
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Wed, 26 Jul 2017 10:38:28 +0000 (10:38 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Wed, 26 Jul 2017 10:38:28 +0000 (10:38 +0000)

Trivial merge