Bug Fixes 2059d46 - ffmpeg timeouts being too low (commit by @zznty) Other Changes 21c87e7 - Merge pull request #376 from Fooxboy/develop Merge develop into master (commit by @Fooxboy)