Merge pull request #6812 from aleksandaratanasov:master
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Tue, 19 Jul 2016 17:21:09 +0000 (17:21 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Tue, 19 Jul 2016 17:21:09 +0000 (17:21 +0000)

Trivial merge