Merge git+ssh://c09-45.sysnet.ucsd.edu/scratch/bluesky