Upstream Drupal 7.24

Change-Id: If9a2a41b8fc63057db27e78ae513f40e35d81460