Merge pull request #7071 from K-Shinotsuka:issue14
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 10 Aug 2016 10:49:05 +0000 (10:49 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 10 Aug 2016 10:49:05 +0000 (10:49 +0000)

Trivial merge