sync now appears to work
Merge remote-tracking branch 'origin/post-alpha' into post-alpha