Merge pull request #13420 from ThadHouse:Windows7shlwapi
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Wed, 12 Dec 2018 14:58:50 +0000 (14:58 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Wed, 12 Dec 2018 14:58:51 +0000 (14:58 +0000)

Trivial merge