Merge pull request #3410 from mgharbi:master
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 12 Nov 2014 08:49:50 +0000 (08:49 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 12 Nov 2014 08:49:50 +0000 (08:49 +0000)

Trivial merge