Drupal 7.31
Merge tag '7.31' into 7.x

7.31 release

Conflicts:
	CHANGELOG.txt
	includes/bootstrap.inc