[drupal7] 7.22

[Peter Borsa]

Summary of changes:

  5fba966... 7.22 (*)

(*) This commit already existed in another branch; no separate mail sent