Merge "Make batterystats logging readable" into pi-dev