Merge pull request #3488 from jeremyhu:PR-4048
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Sat, 6 Dec 2014 08:03:56 +0000 (08:03 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Sat, 6 Dec 2014 08:03:56 +0000 (08:03 +0000)

Trivial merge