Civilian round-start fix
Bulletproofing

Better bulletproofing of the civilian round-start fix
Merge pull request #445 from Bone-White/master

Civilian round-start fix