Merge pull request #7745 from ColinFinck:master
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 28 Nov 2016 16:09:42 +0000 (16:09 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 28 Nov 2016 16:09:42 +0000 (16:09 +0000)

Trivial merge