Merge pull request #7735 from alalek:ts_cv_enum_static_fiasco
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Sat, 26 Nov 2016 08:15:56 +0000 (08:15 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Sat, 26 Nov 2016 08:15:56 +0000 (08:15 +0000)

Trivial merge