Merge branch 'bugfix/peertube-videos' into 'develop'