Merge pull request #3357 from briansp2020:master
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Fri, 7 Nov 2014 12:02:53 +0000 (12:02 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Fri, 7 Nov 2014 12:02:53 +0000 (12:02 +0000)

Trivial merge