Merge Master to feature-h264-videostorage

Bringing branch up to date again. zm_ffmpeg_camera.cpp was a challenge due @Sune1337's changes to structure, so no auto merge tool can handle it. I am keeping moving on this, so could be tested better, but will once I make my next set of changes.