Merge branch '7.15-security' into 7.x

diff --cc CHANGELOG.txt
index 64e00f1,b4beae3..5bae473
--- 1/CHANGELOG.txt
--- 2/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@@ -1,26 -1,9 +1,31 @@@
  
- Drupal 7.16, xxxx-xx-xx (development version)
++Drupal 7.17, xxxx-xx-xx (development version)
 +-----------------------
 +- Fixed the theme settings form to properly clean up submitted values in
 +  $form_state['values'] when the form is submitted (data structure change).
 +- Updated various admin tables to use the default "empty table" text UX
 +  pattern.
 +- Added proxy server support to drupal_http_request().
 +- Added "lang" attributes to language links, to better support screen readers.
 +- Fixed double occurrence of a "ul" HTML tag on secondary local tasks in the
 +  Seven theme (markup change).
 +- Fixed a bug which caused shortcut set titles to be double-escaped. The fix
 +  replaces the "Edit shortcuts" menu item's title callback entry in hook_menu()
 +  with a new function that does not escape HTML characters (data structure
 +  change).
 +- Modified the Update manager module to allow drupal.org to collect usage
 +  statistics for individual modules and themes, rather than only for entire
 +  projects.
 +- Fixed a regression which caused a "call to undefined function
 +  drupal_find_base_themes()" fatal error under rare circumstances.
 +- Added hook_entity_view_mode_alter() to allow modules to change entity view
 +  modes on display.
 +
+ Drupal 7.16, 2012-10-17
+ -----------------------
+ - Fixed security issues (Arbitrary PHP code execution and information
+   disclosure). See SA-CORE-2012-003.
+ 
  Drupal 7.15, 2012-08-01
  -----------------------
  - Introduced a 'user_password_reset_timeout' variable to allow the 24-hour

diff --cc includes/bootstrap.inc
index 709789b,5eb5924..d9ad856
--- 1/includes/bootstrap.inc
--- 2/includes/bootstrap.inc
+++ b/includes/bootstrap.inc
@@@ -8,7 -8,7 +8,7 @@@
  /**
   * The current system version.
   */
- define('VERSION', '7.16-dev');
 -define('VERSION', '7.16');
++define('VERSION', '7.17-dev');
  
  /**
   * Core API compatibility.

diff --cc includes/install.core.inc
Simple merge

diff --cc modules/openid/openid.inc
Simple merge

diff --cc modules/openid/openid.test
Simple merge