Merge pull request #7311 from fran6co:lsd
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 5 Oct 2016 11:27:43 +0000 (11:27 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 5 Oct 2016 11:27:43 +0000 (11:27 +0000)

Trivial merge