Fix for ERT spawning.
Fix for #3432.
Merge pull request #3436 from Segrain/master

Bugfixes.
Merge pull request #2 from Baystation12/master

Moar BS12:master fixes