Upstream Drupal 7.23

Change-Id: I8d155210bba289c81736bcb6f2e8a5ed2bb0e5c9
Merge "Upstream Drupal 7.23"