Merge branch 'doug'