by Dave Reid: Merged 6.x-2.x branch back into HEAD for a Drupal 7 branch. Must get started on this now while working on 6.x-2.x.