Merge pull request #11314 from terfendail:msmf_camera
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Fri, 27 Apr 2018 16:34:29 +0000 (19:34 +0300)
committerGitHub <noreply@github.com>
Fri, 27 Apr 2018 16:34:29 +0000 (19:34 +0300)

Trivial merge