Merge pull request #10266 from ChristofKaufmann:warp_documentation
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Fri, 8 Dec 2017 18:48:48 +0000 (18:48 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Fri, 8 Dec 2017 18:48:48 +0000 (18:48 +0000)

Trivial merge