Merge pull request #13242 from terfendail:contours_wintr
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Mon, 26 Nov 2018 12:29:30 +0000 (12:29 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Mon, 26 Nov 2018 12:29:31 +0000 (12:29 +0000)

Trivial merge