Merge pull request #2940 from davembradley:master
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Tue, 29 Jul 2014 17:22:30 +0000 (17:22 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Tue, 29 Jul 2014 17:22:30 +0000 (17:22 +0000)

Trivial merge