Merge branch 'pyed-xboxclips'