I regression tested before the merge, I will regression test tonight and correct issues that might have crept in. This commit was SVN r7329.
This commit was SVN r6845.
This commit was SVN r6325.
This commit was SVN r6288.