Merge pull request #7855 from logic1988:master
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 19 Dec 2016 13:45:51 +0000 (13:45 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 19 Dec 2016 13:45:51 +0000 (13:45 +0000)

Trivial merge