Sync that last bit with trunk. I'll have to merge that over to the tag for the next RC.