Merge pull request #7540 from K-Shinotsuka:issue31
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Sat, 29 Oct 2016 21:28:25 +0000 (21:28 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Sat, 29 Oct 2016 21:28:25 +0000 (21:28 +0000)

Trivial merge