Merge pull request #3411 from eltermann:master
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 19 Nov 2014 16:25:11 +0000 (16:25 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 19 Nov 2014 16:25:12 +0000 (16:25 +0000)

Trivial merge