Enable movie format ribbons

Per-user configuration to enable movie format ribbons
Merge remote-tracking branch 'upstream/master' into ribbons
Merge branch 'master' into ribbons