the missing source file for videolistcontrollertest
Merge branch 'master'
Merge branch 'Natascha'