Re-approving since it was just a tiny changelog conflict fixed by merging from trunk.
« Back to merge proposal
Re-approving since it was just a tiny changelog conflict fixed by merging from trunk.