This reverts commit f1a8bf13.

Issue #996236 by fago, sun, pillarsdotnet, xjm: Fixed drupal_flush_all_caches() does not clear entity info cache.

Issue #1371484 by catch, langworthy, makara, ArtistConk: Fixed Private properties in abstract class DrupalCacheArray.

Issue #1411592 by dadikof, Niklas Fiekas: Fixed func_get_args() can't be used as a function parameter before PHP 5.3.

- Patch #1346166 by Dave Reid: Improve performance of token_replace() if there are no tokens to replace.

Issue #987930 by David_Rothstein, Tor Arne Thune: Fixed The obsolete 'site_offline_message' variable is not always deleted during the D6->D7 upgrade.

Issue #1402962 by xjm, marcingy, oriol_e9g, msonnabaum: Fixed Render cache shouldn't treat empty strings as a cache miss.

Issue #278425 by andypost, droplet, OnkelTem, chx, c960657, drewish, kotnik, realityloop: Change notice for: Using basename() is not locale safe.

Issue #800434 by pillarsdotnet, plach, bart.hanssens: Added drupal_mail(), allow hook_mail_alter() implementation to cancel mail.

This reverts commit 24c357b5.

Issue follow-up #1007830 by Damien Tournoud, basic: Fixed Nested transactions throw exceptions when they got out of scope.

Issue #1347812 by nanotube, xjm: Fixed Remove/replace documentation references to upload_file_load() and upload_file_delete().

Issue #381994 by xjm, good_man, elcuco, brianV, yhager: Fixed Machine-name fields are always in Latin characters, and should therefore always be LTR.

Issue #1359326 by xjm: Fixed t() documentation does not clearly indicate that  options are documented in format_string() docs.

Issue #1338428 by jbrown, BTMash, Tor Arne Thune: Fixed image_dimensions_scale() and image_scale_effect() are ungrokable and buggy.

Issue #1371256 by ayelet_Cr, oriol_e9g: Document that QueryConditionInterface::condition() should not be used to add NULL conditions.

Issue #942782 by pillarsdotnet, xjm, becw, timhilliard, JohnAlbin, jrchamp, Tor Arne Thune, Damien Tournoud, jn2, James Andres, dstol, melon, colan: Fixed Custom menus never receive an active trail.

Issue #866292 by marcingy, ygerasimov, quicksketch, attiks, furamag: Fixed '0' not displayed as checkbox / radios options (nor as any element #title).

Issue #1366740 by patrickd: Fixed theme_progress_bar() should have more information about when to use function.

Issue #1240256 by lyricnz, Akaoni, jenspeter: Fixed file_unmanaged_copy() Fails with Drupal 7.7+ and safe_mode() or open_basedir().

- Patch #1258000 by chx, xjm, bfroehle: SelectQuery::countQuery() inappropriately removes SQL expressions.

This reverts commit 06f31080.

- Patch #1229868 by nicl, DjebbZ: hook_form_BASE_FORM_ID_alter(), hook_form_alter(), and hook_form_FORM_ID_alter() doc inconsistent.

Issue #479368 by Heine, Roger Saner, xjm, mcarbone, keichee, asimmonds: Fixed Create RFC compliant HTML safe JSON.