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