smallterm-git: Upstream changes