Merge pull request #9969 from mshabunin:dispatch-vs-folders
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Tue, 31 Oct 2017 09:20:52 +0000 (09:20 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Tue, 31 Oct 2017 09:20:52 +0000 (09:20 +0000)

Trivial merge