Merge exclusives branch.

Auditors: benjy