Merge pull request #7188 from valeriyvan:andfutheriosfixes
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Wed, 14 Sep 2016 17:05:34 +0000 (17:05 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Wed, 14 Sep 2016 17:05:34 +0000 (17:05 +0000)

Trivial merge