Merge pull request #8495 from ja-pa/mjpg-streamer