Merge pull request #6236 from alalek:backport_6232
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Sat, 12 Mar 2016 16:38:56 +0000 (16:38 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Sat, 12 Mar 2016 16:38:56 +0000 (16:38 +0000)

Trivial merge