[audacity-freeworld/f31] (3 commits) ...merge master except the ffmpeg conditional.