Merge branch 'master' into docking # Conflicts: # backends/imgui_impl_metal.h # backends/imgui_impl_metal.mm # imgui.cpp