Merge pull request #2058 from norbini/ticket_13784_videoscanner_skips_sftp