Bringing HEAD up in line with top of DRUPAL-5 branch, bringing forward the latest changes done by [mfer]