Merge pull request #8981 from alalek:port_8979
authorMaksim Shabunin <maksim.shabunin@gmail.com>
Mon, 26 Jun 2017 09:25:23 +0000 (09:25 +0000)
committerMaksim Shabunin <maksim.shabunin@gmail.com>
Mon, 26 Jun 2017 09:25:23 +0000 (09:25 +0000)

Trivial merge