Merge branch 'ac2' of mach277:/home/majorb/git/opencadc into ac2