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