Merge git://git.infradead.org/users/dwmw2/spectra-2.6 into work