Merge branch 'master' of git.fsmpi.rwth-aachen.de:videoaginfra/ffworker

1 job for master in 6 minutes and 24 seconds (queued for 42 seconds)