Merge pull request #1761 from bhuroc:qtkit-video-file-2.4