Dumping sections of Stargate management, issue #231.
Merge remote-tracking branch 'origin/master'