Fixes #2424
Merge pull request #3181 from Zuhayr/master

Fixes solar control and SMES for borgs.