Merge pull request #7384 from K-Shinotsuka:issue24
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Tue, 4 Oct 2016 12:06:37 +0000 (12:06 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Tue, 4 Oct 2016 12:06:37 +0000 (12:06 +0000)

Trivial merge