Merge branch 'gregoa' of colleen:bti into gregoa