merging in dave's indigo-devel