Merge git://git.infradead.org/~dwmw2/khdrs-2.6