Merge pull request #16828 from paroj:nmspy
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Thu, 19 Mar 2020 16:43:43 +0000 (16:43 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Thu, 19 Mar 2020 16:43:43 +0000 (16:43 +0000)

Trivial merge