Merge dead branch 'ossman'