Merge pull request #5657 from tianzhi0549:fixed-the-type-inconsistent-with-document
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Thu, 10 Dec 2015 13:24:13 +0000 (13:24 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Thu, 10 Dec 2015 13:24:13 +0000 (13:24 +0000)

Trivial merge