Merge pull request #6548 from fnorf:master
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 25 May 2016 13:16:07 +0000 (13:16 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 25 May 2016 13:16:07 +0000 (13:16 +0000)

Trivial merge