Fix for #2430.
Merge pull request #3183 from Segrain/master

ID cards bugfix.
Merge pull request #3181 from Zuhayr/master

Fixes solar control and SMES for borgs.
Fixes #3191