2.6 Code Freeze on 8/21

The 2.6 code freeze is less than 2 weeks away. I will create the branch on 8/21 at 9PM PDT.

As always, please be considerate about what you check in right before this code freeze. Any major changes should be checked in this week in order to ensure adequate testing.