Update from r13967.

Update with latest changes from core/ttcal