Merge pull request #12078 from mshabunin:fix-plus-dir
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Fri, 27 Jul 2018 15:00:33 +0000 (15:00 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Fri, 27 Jul 2018 15:00:33 +0000 (15:00 +0000)

Trivial merge