Two of the patches I was using for Drupal core made it into 7.22