Merge pull request #7336 from K-Shinotsuka:issue23
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Tue, 4 Oct 2016 12:29:46 +0000 (12:29 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Tue, 4 Oct 2016 12:29:46 +0000 (12:29 +0000)

Trivial merge