12812 and 12813 should have been done on the trunk.  Please merge them over now and keep the branch focused.  Do we need to shut down the branch?

--dave