Merge pull request #7763 from jrheard:patch-1
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Thu, 1 Dec 2016 18:04:55 +0000 (18:04 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Thu, 1 Dec 2016 18:04:55 +0000 (18:04 +0000)

Trivial merge