Merge branch 'master' into pipe-video