Missing files from Drupal 7.18 upgrade + tBoekske from jan-feb