Merge pull request #7742 from alalek:backport_5884
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 28 Nov 2016 20:53:27 +0000 (20:53 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 28 Nov 2016 20:53:27 +0000 (20:53 +0000)

Trivial merge