Merge branch 's1682' of mach275:/data/local/pdowler/dev/opencadc into s1682