Merge the GO changes dfighter2->Master part 28

MODIFIED: White magic numbers be gone! We prefer black magic around here!