Merge pull request #3096 from Zuhayr/master

Solar charging fix.
Sanity checking for zone disconnection.  I am dumb some days.
Merge pull request #3105 from SkyMarshal/airfixes

Sanity checking for zone disconnection.  I am dumb some days.
Quickfix for INFINIMEAT.
Merge pull request #3111 from Spamcat/master

MEATFIX
Fixes #3106