Drupal 6.31
Merge tag '6.31' into 6.x

6.31 release

Conflicts:
	CHANGELOG.txt
	modules/system/system.module