minor cosmetic change
Merge remote-tracking branch 'origin/master' into 15---multiple-video-files