Merge pull request #9429 from StevenPuttemans:fix_9404
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 22 Aug 2017 09:25:29 +0000 (09:25 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 22 Aug 2017 09:25:29 +0000 (09:25 +0000)

Trivial merge