Merge pull request #7777 from alalek:test_refactor
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Fri, 2 Dec 2016 20:09:55 +0000 (20:09 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Fri, 2 Dec 2016 20:09:56 +0000 (20:09 +0000)

Trivial merge