CriticalPowerWindow: Add a Heat by Date option
CpintPlot: Small correction
merge upstream into master