Merge remote-tracking branch 'nobled/wayland-fixes2'