Upstream Drupal 7.24

Change-Id: If9a2a41b8fc63057db27e78ae513f40e35d81460
Merge branch 'contrib' into HEAD

Conflicts:
	modules/system/system.test

Change-Id: Ib6f523eb94ebc89631ed7a20ef22a57e9831bb49