Merge pull request #13294 from terfendail:contours_wintr
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 27 Nov 2018 13:54:23 +0000 (13:54 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 27 Nov 2018 13:54:23 +0000 (13:54 +0000)

Trivial merge