manually merge changes to X11-mod/X13-mod kernels (lazybear)