Merge pull request #11836 from terfendail:msmf_camfallback
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Tue, 26 Jun 2018 12:17:55 +0000 (12:17 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Tue, 26 Jun 2018 12:17:55 +0000 (12:17 +0000)

Trivial merge