Merge pull request #6831 from bobpaulin:master
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 18 Jul 2016 15:24:35 +0000 (15:24 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 18 Jul 2016 15:24:35 +0000 (15:24 +0000)

Trivial merge