Merged changes from trunk.
Merged changes from trunk.
Fixed compilation.
Merged latest changes from trunk.
Merged changes from trunk.
Merged latest changes from trunk.
Temporarily reverted the last commit [86164], until 1.55 beta ships.
Reapplied changeset [86160].