upstream changes for urxvt-9.16