Merged to trunk via check-in [90142c95cc].