merge upstream libavim fix