Merge pull request #4054 from gongzg:master
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Tue, 26 May 2015 07:46:03 +0000 (07:46 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Tue, 26 May 2015 07:46:03 +0000 (07:46 +0000)

Trivial merge