Merge pull request #7856 from mshabunin:long-tests
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Wed, 14 Dec 2016 15:52:23 +0000 (15:52 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Wed, 14 Dec 2016 15:52:23 +0000 (15:52 +0000)

Trivial merge