Merge pull request #7042 from alalek:update_6967
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 8 Aug 2016 15:17:48 +0000 (15:17 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 8 Aug 2016 15:17:48 +0000 (15:17 +0000)

Trivial merge