Merge pull request #8401 from avartenkov:multichannel_warp
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 21 Mar 2017 11:59:56 +0000 (11:59 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 21 Mar 2017 11:59:56 +0000 (11:59 +0000)

Trivial merge