Merge pull request #12860 from janisozaur:include-guards
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Wed, 17 Oct 2018 08:20:31 +0000 (08:20 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Wed, 17 Oct 2018 08:20:31 +0000 (08:20 +0000)

Trivial merge