Merge pull request #10928 from Mehanik:fix_timeout
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Wed, 7 Mar 2018 12:34:09 +0000 (12:34 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Wed, 7 Mar 2018 12:34:09 +0000 (12:34 +0000)

Trivial merge