Issue #2309549 by Bevan, er.pushpinderrana: Fix incorrect documentation of node-type-specific hooks
Issue #2309687 by eriksm: Fix typo in docs for verbose test class method
Merge tag '7.31' into 7.x

7.31 release

Conflicts:
	CHANGELOG.txt
	includes/bootstrap.inc
Issue #2318981 by grisendo: Make hook_node_grants and hook_node_access_records sample function bodies consistent
Issue #2324083 by er.pushpinderrana, martin_q: Fix up description of return value from drupal_array_get_nested_value()
Issue #993186 by joshi.rohit100, moshe weitzman | webchick: Node access rebuilds should go newest to oldest (fix for direct node access rebuilds only, not rebuilds done via a batch).
Issue #1468210 by marthinal, quicksketch, tstoeckler, Devin Carlson, David_Rothstein, Eric_A: Fixed Remove special $user->uid == 1 check in file_validate_size().
Issue #1890980 by amitgoyal, robinvdvleuten: Fixed Unnecessary extra output variable in theme_links.
Issue #1859084 by Jorrit, David_Rothstein, attiks: Improved database queries generated by EntityFieldQuery in the case where delta or language condition groups are used, to reduce the number of INNER JOINs.
Issue #2277281 by dobe, amitgoyal, michaelfavia, er.pushpinderrana, dcam | drumm: Increase the maximum number of characters on the file field allowed extensions setting from 128 to 256.
Issue #1166114 by jhodgdon, tomogden, Rajendar Reddy, larowlan, swentel, splatio, erics14, MF82 | RobLoach: Renamed the "Search result" view mode to "Search result highlighting input" to better reflect how it is used.
Issue #2334689 by er.pushpinderrana, joachim: Document character limit on lock_aquire() for lock name
Issue #2314181 by roderik, er.pushpinderrana, hefox: Fix docs for drupal_static
Issue #2340675 by er.pushpinderrana, David Hernández: Clarify first, unused argument docs in update_calculate_project_update_status()
Issue #2283675 by er.pushpinderrana, amitgoyal, mparker17, joachim, mmarquez: Document how optgroups are generated in form_select_options()
SA-CORE-2014-005 by Stefan Horst, greggles, larowlan, David_Rothstein, klausi: Fixed SQL injection vulnerability
Tests for SA-CORE-2014-005 by Stefan Horst, greggles, larowlan, David_Rothstein, klausi
Drupal 7.32
Merge tag '7.32' into 7.x

7.32 release

Conflicts:
	CHANGELOG.txt
	includes/bootstrap.inc
Issue #2329189 by nlisgo, joachim, Mirroar, opdavies: Fix up docs and example code for hook_field_attach_validate()