Drupal 7.26
Merge tag '7.26' into 7.x

7.26 release

Conflicts:
	CHANGELOG.txt
	includes/bootstrap.inc