Merging in sps-gamelib fixes from the Aigilas 1.0 release