Merge pull request #9007 from alalek:issue_9001
authorMaksim Shabunin <maksim.shabunin@gmail.com>
Tue, 27 Jun 2017 14:38:43 +0000 (14:38 +0000)
committerMaksim Shabunin <maksim.shabunin@gmail.com>
Tue, 27 Jun 2017 14:38:43 +0000 (14:38 +0000)

Trivial merge