Some more work on the Celestial Gateway...
Merge remote-tracking branch 'upstream/master'