update of contrib
Merge development from branch: drupal7