Merge remote-tracking branch 'lwho/no_global_galaxy'
Proper load/save support for Galaxy generator.