Merged latest changes from trunk.
71 files changed