* Sync up to trunk HEAD (r62285). Branch guys deserve the significant speedups too ;)