Merging changes with Iteration-6.
Merging changes with the Iteration-6 branch.