Merge pull request #2985 from StevenPuttemans:fix_3777_redo
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Sat, 19 Jul 2014 18:02:20 +0000 (18:02 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Sat, 19 Jul 2014 18:02:20 +0000 (18:02 +0000)

Trivial merge