Merge some deployment changes to trunk: r82738 (as HISTORY), r81962