Drupal 7.20
Merge tag 'refs/tags/7.20' into drupal-7.20

7.20 release
Merge branch 'drupal-7.20'