David Quintana
committed
on 10 Sep
* Sync with trunk HEAD (r75820).