Summary of changes:
61c3c47... Update to 2.1 snapshot (*)
0c28438... Disable FFmpeg (*)
fa5d31b... Re-add missing dist macro (*)
38a8b52... Update to (inofficial) 2.1.0-rc1 snapshot (*)
9b3db1d... Update to 2.1.0-rc1 pre-release version (*)
(*) This commit already existed in another branch; no separate mail sent