Merge tag 'v1.90.8' into external/win98

# Conflicts:
#	imgui.cpp
#	imgui_widgets.cpp