Merge pull request #7108 from K-Shinotsuka:issue16
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Fri, 19 Aug 2016 08:10:51 +0000 (08:10 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Fri, 19 Aug 2016 08:10:51 +0000 (08:10 +0000)

Trivial merge