Stop Naval Factories from sinking
First attempt and cleanup
Final version of ACU fix
Port fix to sACU and clean up whitespace
Re-add code that went missing
Merge remote-tracking branch 'icedreamer/ACU-Drone-Bugfix' into develop
Merge branch 'icedreamer/Fix-Sinking' into develop