Conflicts:
	CHANGELOG.txt
	includes/bootstrap.inc

Issue #1934568 by David_Rothstein, pwolanin: Allow sites using the 'image_allow_insecure_derivatives' variable to have partial protection from the security issues fixed in Drupal 7.20.

Issue #1347914 by Albert Volkman, Lars Toomre, batigolix, NROTC_Webmaster, xjm, sven.lauer: Fix up API docs for Filter module

Issue #1923554 by David_Rothstein, pwolanin, mitron | alfaguru: Fixed New anti-DoS measure breaks for some file URIs.

Issue #1266572 by znerol, joshf: Fixed Workaround in UpdateQuery_sqlite() for affected rows count causes certain updates to be suppressed.

Issue #1012620 by Berdir, kbasarab, YesCT: Fixed Unique key on date_formats().(format|type) is problematic for case insensitive collations.

Issue #1908194 by  richard.c.allen2386: Document what happens in drupal_get_path if the file is not found

Issue #1397346 by Albert Volkman, kristiaanvandeneynde, larowlan, bobbyaldol, tim-e, shiff2kl, FatGuyLaughing: Add and fix up documentation in image and node module files

Issue #1879022 by omegamonk: Fixed Enforced dependencies errors updating to recent versions of Drupal 7.

Add note to CHANGELOG.txt pointing to the change notification for the _field_info_collate_fields() memory usage commit.

Issue #1040790 by yched, swentel, geerlingguy, justin.randell, Berdir | catch: Fixed _field_info_collate_fields() memory usage.

Issue #1893530 by alippai: Document that bundles element is not required for one-bundle entities in hook_entity_info

Issue #1317628 by Albert Volkman, Gaelan, disasm, mjonesdinero, xjm: Clean up API docs for include files n-z

Issue #1888454 by kiamlaluno: Remove irrelevant information from form_process_vertical_tabs() documentation

Issue #1156576 by pixelite, Ryan Weal, jhodgdon, plach, Albert Volkman: Better documentation for language negotiation

Issue #1870612 by David_Rothstein, plach, greggles: Add tests for SA-CORE-2012-004 - Drupal core - Arbitrary code execution via file upload.