Revert "Revert "Civilian round-start fix""
Merge pull request #448 from Bone-White/revert-446-revert-445-master

Revert "Revert "Civilian round-start fix""