merging nikomatsakis/rust/assoc-types = 004a567d into auto