Merging more recent genstat updates into my branch