Merge pull request #7665 from K-Shinotsuka:issue36
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Tue, 22 Nov 2016 13:44:42 +0000 (13:44 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Tue, 22 Nov 2016 13:44:42 +0000 (13:44 +0000)

Trivial merge