[dwm-git] Merge changes from upstream