Merge pull request #3096 from Zuhayr/master

Solar charging fix.