cherry-picked commits from upstream repo (frdmn/dotfiles)