Merge branch 'dstftw-best-fallback-on-outdated-avconv'