Merged r9830 from trunk.
Merged r9837 from trunk.
Merged r9836 from trunk.
Merged r9831 from trunk.
Merged r9822 from trunk.
CHANGELOG updated.
Merged r9796 from trunk.