diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 94522f5aaed35e2fe3abf500b95fd545fc0d6922..7f4f0ffe1c2b38303086b332eaa3cf6d445160f6 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,3 +1,6 @@
+Drupal 7.18, 2012-12-19
+-----------------------
+- Fixed security issues (multiple vulnerabilities). See SA-CORE-2012-004.
 
 Drupal 7.17, 2012-11-07
 -----------------------
diff --git a/includes/bootstrap.inc b/includes/bootstrap.inc
index cd41f0bbf6eacb92c565b55be24bd098c34df3bf..840733acc88d24f5d6243625734262b4a674520a 100644
--- a/includes/bootstrap.inc
+++ b/includes/bootstrap.inc
@@ -8,7 +8,7 @@
 /**
  * The current system version.
  */
-define('VERSION', '7.17');
+define('VERSION', '7.18');
 
 /**
  * Core API compatibility.
diff --git a/includes/file.inc b/includes/file.inc
index 1e256c6349d09aace03884234ed07d01582dfb9d..278be3ddcefaffd28894898636f88874122a1c5e 100644
--- a/includes/file.inc
+++ b/includes/file.inc
@@ -1113,6 +1113,9 @@ function file_munge_filename($filename, $extensions, $alerts = TRUE) {
 
   // Allow potentially insecure uploads for very savvy users and admin
   if (!variable_get('allow_insecure_uploads', 0)) {
+    // Remove any null bytes. See http://php.net/manual/en/security.filesystem.nullbytes.php
+    $filename = str_replace(chr(0), '', $filename);
+
     $whitelist = array_unique(explode(' ', trim($extensions)));
 
     // Split the filename up by periods. The first part becomes the basename
diff --git a/modules/aggregator/aggregator.info b/modules/aggregator/aggregator.info
index 2f1d05357fbb80831cb2a48f03ef5af7f4e16974..9887301cc0d0a0627b0047e936fe2726f7ae8641 100644
--- a/modules/aggregator/aggregator.info
+++ b/modules/aggregator/aggregator.info
@@ -7,8 +7,8 @@ files[] = aggregator.test
 configure = admin/config/services/aggregator/settings
 stylesheets[all][] = aggregator.css
 
-; Information added by drupal.org packaging script on 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
 project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
 
diff --git a/modules/aggregator/tests/aggregator_test.info b/modules/aggregator/tests/aggregator_test.info
index 204d2edf20d496cf43fef9322b6023ac7a0a3834..7064c0505a231d5e5cd0705e36d47c42614e806e 100644
--- a/modules/aggregator/tests/aggregator_test.info
+++ b/modules/aggregator/tests/aggregator_test.info
@@ -5,8 +5,8 @@ version = VERSION
 core = 7.x
 hidden = TRUE
 
-; Information added by drupal.org packaging script on 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
 project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
 
diff --git a/modules/block/block.info b/modules/block/block.info
index cd9bf089ca655918214908c1e275f9a146fc6565..7d9b32caccc705044b5c635da1d0ec82119720a5 100644
--- a/modules/block/block.info
+++ b/modules/block/block.info
@@ -6,8 +6,8 @@ core = 7.x
 files[] = block.test
 configure = admin/structure/block
 
-; Information added by drupal.org packaging script on 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
 project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
 
diff --git a/modules/block/tests/block_test.info b/modules/block/tests/block_test.info
index 077515208f48cfff6f0ca6bc80c6f2a5d2795d74..1bdcb81a38a87784f2bf3635ef656925423e50d4 100644
--- a/modules/block/tests/block_test.info
+++ b/modules/block/tests/block_test.info
@@ -5,8 +5,8 @@ version = VERSION
 core = 7.x
 hidden = TRUE
 
-; Information added by drupal.org packaging script on 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
 project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
 
diff --git a/modules/block/tests/themes/block_test_theme/block_test_theme.info b/modules/block/tests/themes/block_test_theme/block_test_theme.info
index 4b585c5c9974b189f10b99fe35adc9fde3674810..0cc047bbe8f97844f59314fd1d7aa8cb8849aa4b 100644
--- a/modules/block/tests/themes/block_test_theme/block_test_theme.info
+++ b/modules/block/tests/themes/block_test_theme/block_test_theme.info
@@ -13,8 +13,8 @@ regions[footer] = Footer
 regions[highlighted] = Highlighted
 regions[help] = Help
 
-; Information added by drupal.org packaging script on 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
 project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
 
diff --git a/modules/blog/blog.info b/modules/blog/blog.info
index bdfc3c03d2a5b5cfef3c20aecf9ed78f4d64c054..34cf743012a32dfb826a17076ef8809834624057 100644
--- a/modules/blog/blog.info
+++ b/modules/blog/blog.info
@@ -5,8 +5,8 @@ version = VERSION
 core = 7.x
 files[] = blog.test
 
-; Information added by drupal.org packaging script on 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
 project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
 
diff --git a/modules/book/book.info b/modules/book/book.info
index d3e42dd443fc5854aa89e71a71c75ee6c5a7b224..d5e744df7507b9e5e55dc1499246fa6f2f955b59 100644
--- a/modules/book/book.info
+++ b/modules/book/book.info
@@ -7,8 +7,8 @@ files[] = book.test
 configure = admin/content/book/settings
 stylesheets[all][] = book.css
 
-; Information added by drupal.org packaging script on 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
 project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
 
diff --git a/modules/color/color.info b/modules/color/color.info
index a12fcdd54f1d70d3a22a56c5cbbe69918bb6c82f..cf86080a2c9c18cca1f3ab31dff47e287cd2bb5b 100644
--- a/modules/color/color.info
+++ b/modules/color/color.info
@@ -5,8 +5,8 @@ version = VERSION
 core = 7.x
 files[] = color.test
 
-; Information added by drupal.org packaging script on 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
 project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
 
diff --git a/modules/comment/comment.info b/modules/comment/comment.info
index c42f7afbad5194af6c15f17f633ffafa653e97c7..0dfbf05fca73b88a56fb7dff2d6b946a1973f2cd 100644
--- a/modules/comment/comment.info
+++ b/modules/comment/comment.info
@@ -9,8 +9,8 @@ files[] = comment.test
 configure = admin/content/comment
 stylesheets[all][] = comment.css
 
-; Information added by drupal.org packaging script on 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
 project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
 
diff --git a/modules/contact/contact.info b/modules/contact/contact.info
index 42c369994d36aa0653ffd56ae0c702187d0d811a..958b8757bddb28901df51c0cf82dd772c036c27e 100644
--- a/modules/contact/contact.info
+++ b/modules/contact/contact.info
@@ -6,8 +6,8 @@ core = 7.x
 files[] = contact.test
 configure = admin/structure/contact
 
-; Information added by drupal.org packaging script on 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
 project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
 
diff --git a/modules/contextual/contextual.info b/modules/contextual/contextual.info
index b88194467acbd67679b781651fba2c324ccdec9d..03e455e3c1fe6f0516476d0a3e64890326841a7c 100644
--- a/modules/contextual/contextual.info
+++ b/modules/contextual/contextual.info
@@ -5,8 +5,8 @@ version = VERSION
 core = 7.x
 files[] = contextual.test
 
-; Information added by drupal.org packaging script on 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
 project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
 
diff --git a/modules/dashboard/dashboard.info b/modules/dashboard/dashboard.info
index 30091ddce6679041edb05077fffc2af8e7b56497..730eb3f94fd2bf296ce034358967db98014b4350 100644
--- a/modules/dashboard/dashboard.info
+++ b/modules/dashboard/dashboard.info
@@ -7,8 +7,8 @@ files[] = dashboard.test
 dependencies[] = block
 configure = admin/dashboard/customize
 
-; Information added by drupal.org packaging script on 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
 project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
 
diff --git a/modules/dblog/dblog.info b/modules/dblog/dblog.info
index 3935ee9a4128bdb0a26a065dfe424ea01f23792d..f6820a780cc22e58b1d8438aa17efbc8200c2dd2 100644
--- a/modules/dblog/dblog.info
+++ b/modules/dblog/dblog.info
@@ -5,8 +5,8 @@ version = VERSION
 core = 7.x
 files[] = dblog.test
 
-; Information added by drupal.org packaging script on 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
 project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
 
diff --git a/modules/field/field.info b/modules/field/field.info
index 88d4088bd55a39464076e9983622f1b154fbc180..084cf2a4642519f4fdb79ca57289ec579d878b66 100644
--- a/modules/field/field.info
+++ b/modules/field/field.info
@@ -10,8 +10,8 @@ dependencies[] = field_sql_storage
 required = TRUE
 stylesheets[all][] = theme/field.css
 
-; Information added by drupal.org packaging script on 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
 project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
 
diff --git a/modules/field/modules/field_sql_storage/field_sql_storage.info b/modules/field/modules/field_sql_storage/field_sql_storage.info
index d7d5e8e56730fd234b89196921d3d8f76268b438..57760f84fdc1812525d5ab7aabded2f97548063b 100644
--- a/modules/field/modules/field_sql_storage/field_sql_storage.info
+++ b/modules/field/modules/field_sql_storage/field_sql_storage.info
@@ -7,8 +7,8 @@ dependencies[] = field
 files[] = field_sql_storage.test
 required = TRUE
 
-; Information added by drupal.org packaging script on 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
 project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
 
diff --git a/modules/field/modules/list/list.info b/modules/field/modules/list/list.info
index 515b31095f296178449fac3bb61e4a783eea8d17..eb2c65933604723ba0d8aa8d814727014a2f09b1 100644
--- a/modules/field/modules/list/list.info
+++ b/modules/field/modules/list/list.info
@@ -7,8 +7,8 @@ dependencies[] = field
 dependencies[] = options
 files[] = tests/list.test
 
-; Information added by drupal.org packaging script on 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
 project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
 
diff --git a/modules/field/modules/list/tests/list_test.info b/modules/field/modules/list/tests/list_test.info
index 107e3f98a1b9bc1c11c6110d43f9ca23e71a17d9..0a2ef03de00240dc1b7cd57ea1622ecb42120e5f 100644
--- a/modules/field/modules/list/tests/list_test.info
+++ b/modules/field/modules/list/tests/list_test.info
@@ -5,8 +5,8 @@ package = Testing
 version = VERSION
 hidden = TRUE
 
-; Information added by drupal.org packaging script on 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
 project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
 
diff --git a/modules/field/modules/number/number.info b/modules/field/modules/number/number.info
index 478f2301caa4482fb15a206202095bd21706ac76..b32acb268e2488f7ac2656ac1924666ffda5c99d 100644
--- a/modules/field/modules/number/number.info
+++ b/modules/field/modules/number/number.info
@@ -6,8 +6,8 @@ core = 7.x
 dependencies[] = field
 files[] = number.test
 
-; Information added by drupal.org packaging script on 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
 project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
 
diff --git a/modules/field/modules/options/options.info b/modules/field/modules/options/options.info
index abe3ac44c9d610d66fc01c39cc351f5090632062..debab886db938ce9da96f6a8e178e2d12ffad357 100644
--- a/modules/field/modules/options/options.info
+++ b/modules/field/modules/options/options.info
@@ -6,8 +6,8 @@ core = 7.x
 dependencies[] = field
 files[] = options.test
 
-; Information added by drupal.org packaging script on 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
 project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
 
diff --git a/modules/field/modules/text/text.info b/modules/field/modules/text/text.info
index 811d6417ce33375b98a557b4da01c406acb381d4..9b99a3439b9b45bee9a643c8f54c69b053b915e0 100644
--- a/modules/field/modules/text/text.info
+++ b/modules/field/modules/text/text.info
@@ -7,8 +7,8 @@ dependencies[] = field
 files[] = text.test
 required = TRUE
 
-; Information added by drupal.org packaging script on 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
 project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
 
diff --git a/modules/field/tests/field_test.info b/modules/field/tests/field_test.info
index 2b7673928f536bd4c67503ee5a113b86319f053d..1a41f1da8b4dcb84a09d6053194cd356338cb833 100644
--- a/modules/field/tests/field_test.info
+++ b/modules/field/tests/field_test.info
@@ -6,8 +6,8 @@ files[] = field_test.entity.inc
 version = VERSION
 hidden = TRUE
 
-; Information added by drupal.org packaging script on 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
 project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
 
diff --git a/modules/field_ui/field_ui.info b/modules/field_ui/field_ui.info
index b68a951b281a5ff15462e6c61e1bbe3a0ddc1c1a..6975caa29f591e078bd37f6947abb3d85d3fc09f 100644
--- a/modules/field_ui/field_ui.info
+++ b/modules/field_ui/field_ui.info
@@ -6,8 +6,8 @@ core = 7.x
 dependencies[] = field
 files[] = field_ui.test
 
-; Information added by drupal.org packaging script on 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
 project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
 
diff --git a/modules/file/file.info b/modules/file/file.info
index 16b58dd4b592a614c6d03095ac1cd72ae404aa80..b6ff17215c0ba63a03606ab773d8f33fcc650834 100644
--- a/modules/file/file.info
+++ b/modules/file/file.info
@@ -6,8 +6,8 @@ core = 7.x
 dependencies[] = field
 files[] = tests/file.test
 
-; Information added by drupal.org packaging script on 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
 project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
 
diff --git a/modules/file/tests/file_module_test.info b/modules/file/tests/file_module_test.info
index a0725de9b78d96cbcb3d34466fd136d6264c5684..53bdf7dd370e25e55c6f02fffc081e1fede480f0 100644
--- a/modules/file/tests/file_module_test.info
+++ b/modules/file/tests/file_module_test.info
@@ -5,8 +5,8 @@ version = VERSION
 core = 7.x
 hidden = TRUE
 
-; Information added by drupal.org packaging script on 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
 project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
 
diff --git a/modules/filter/filter.info b/modules/filter/filter.info
index 8de2adfca41775360e680657c934b865892d7c9b..679716337b383dad54b601ef200a1db889ac02b7 100644
--- a/modules/filter/filter.info
+++ b/modules/filter/filter.info
@@ -7,8 +7,8 @@ files[] = filter.test
 required = TRUE
 configure = admin/config/content/formats
 
-; Information added by drupal.org packaging script on 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
 project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
 
diff --git a/modules/forum/forum.info b/modules/forum/forum.info
index 5f46897dbaf8be24e14b13c655b7151f838adca7..f566804401ef05c7d4fd844138bb9d84e8788790 100644
--- a/modules/forum/forum.info
+++ b/modules/forum/forum.info
@@ -9,8 +9,8 @@ files[] = forum.test
 configure = admin/structure/forum
 stylesheets[all][] = forum.css
 
-; Information added by drupal.org packaging script on 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
 project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
 
diff --git a/modules/help/help.info b/modules/help/help.info
index 23645a23e34905e3634bb41a026d3c9b8bbafe7c..9942a8bc379cc1d899f7bbe3e8593073a8c179fa 100644
--- a/modules/help/help.info
+++ b/modules/help/help.info
@@ -5,8 +5,8 @@ version = VERSION
 core = 7.x
 files[] = help.test
 
-; Information added by drupal.org packaging script on 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
 project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
 
diff --git a/modules/image/image.info b/modules/image/image.info
index df2551816527a94de5d870c31eb59ed0f051d253..c157ddce589397f0a7ca06f9596464286c52fb34 100644
--- a/modules/image/image.info
+++ b/modules/image/image.info
@@ -7,8 +7,8 @@ dependencies[] = file
 files[] = image.test
 configure = admin/config/media/image-styles
 
-; Information added by drupal.org packaging script on 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
 project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
 
diff --git a/modules/image/tests/image_module_test.info b/modules/image/tests/image_module_test.info
index 9e3832236b1c6541002ea50b20208b684ceb514a..e9b4e294277071c38cf1d1a892d955489ec99e61 100644
--- a/modules/image/tests/image_module_test.info
+++ b/modules/image/tests/image_module_test.info
@@ -6,8 +6,8 @@ core = 7.x
 files[] = image_module_test.module
 hidden = TRUE
 
-; Information added by drupal.org packaging script on 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
 project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
 
diff --git a/modules/locale/locale.info b/modules/locale/locale.info
index 0861a48eb8ca4415ea6850c97e99fca5f0acbbcb..842d86b3102ed90bb2ee3748dc8ab908c7e98b43 100644
--- a/modules/locale/locale.info
+++ b/modules/locale/locale.info
@@ -6,8 +6,8 @@ core = 7.x
 files[] = locale.test
 configure = admin/config/regional/language
 
-; Information added by drupal.org packaging script on 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
 project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
 
diff --git a/modules/locale/tests/locale_test.info b/modules/locale/tests/locale_test.info
index ffd5175fee4d14ebf8c3e4b87db767dff86145cc..64c039c6ccc5caa12150cfe8863e35b1be709e86 100644
--- a/modules/locale/tests/locale_test.info
+++ b/modules/locale/tests/locale_test.info
@@ -5,8 +5,8 @@ package = Testing
 version = VERSION
 hidden = TRUE
 
-; Information added by drupal.org packaging script on 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
 project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
 
diff --git a/modules/menu/menu.info b/modules/menu/menu.info
index 18a57a735a1c390b29726e178652ce26ded66dac..d70a4dd4cdd1692e939ba61d6ba409cf021b7b78 100644
--- a/modules/menu/menu.info
+++ b/modules/menu/menu.info
@@ -6,8 +6,8 @@ core = 7.x
 files[] = menu.test
 configure = admin/structure/menu
 
-; Information added by drupal.org packaging script on 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
 project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
 
diff --git a/modules/node/node.info b/modules/node/node.info
index d2fd883ae215b55b8f30bb1a66bf737efd134a50..6dcc592ff569a0dcfcedac464b9b3d07f9fdd8d6 100644
--- a/modules/node/node.info
+++ b/modules/node/node.info
@@ -9,8 +9,8 @@ required = TRUE
 configure = admin/structure/types
 stylesheets[all][] = node.css
 
-; Information added by drupal.org packaging script on 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
 project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
 
diff --git a/modules/node/tests/node_access_test.info b/modules/node/tests/node_access_test.info
index 7312d2fa97d53a8e344ee9adab1da34f0a37673c..c7d42d730d767a534fa8510bbe9cfa39f9be6f0a 100644
--- a/modules/node/tests/node_access_test.info
+++ b/modules/node/tests/node_access_test.info
@@ -5,8 +5,8 @@ version = VERSION
 core = 7.x
 hidden = TRUE
 
-; Information added by drupal.org packaging script on 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
 project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
 
diff --git a/modules/node/tests/node_test.info b/modules/node/tests/node_test.info
index 702d44a4e4b80b504fe8e5f7af9eee75aed22f02..5b3f0abc11aeda6e664f20adfc5325e6aa0b955e 100644
--- a/modules/node/tests/node_test.info
+++ b/modules/node/tests/node_test.info
@@ -5,8 +5,8 @@ version = VERSION
 core = 7.x
 hidden = TRUE
 
-; Information added by drupal.org packaging script on 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
 project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
 
diff --git a/modules/node/tests/node_test_exception.info b/modules/node/tests/node_test_exception.info
index 795f53667d09f1c2804a5636b5114280d37d5071..1612b85505842fb1458542b97aef39155d48c021 100644
--- a/modules/node/tests/node_test_exception.info
+++ b/modules/node/tests/node_test_exception.info
@@ -5,8 +5,8 @@ version = VERSION
 core = 7.x
 hidden = TRUE
 
-; Information added by drupal.org packaging script on 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
 project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
 
diff --git a/modules/openid/openid.info b/modules/openid/openid.info
index 5faa5f5334f9cc705c648bdb58aada7743a0a00e..51cb00d723f6b6aa5a7266c06dfe5b0e38dfd804 100644
--- a/modules/openid/openid.info
+++ b/modules/openid/openid.info
@@ -5,8 +5,8 @@ package = Core
 core = 7.x
 files[] = openid.test
 
-; Information added by drupal.org packaging script on 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
 project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
 
diff --git a/modules/openid/tests/openid_test.info b/modules/openid/tests/openid_test.info
index dccc075ce7c88234c6e944fdaffd8da601435c4d..f86312e6953369fe69540c3cd9786d5f643af59f 100644
--- a/modules/openid/tests/openid_test.info
+++ b/modules/openid/tests/openid_test.info
@@ -6,8 +6,8 @@ core = 7.x
 dependencies[] = openid
 hidden = TRUE
 
-; Information added by drupal.org packaging script on 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
 project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
 
diff --git a/modules/overlay/overlay.info b/modules/overlay/overlay.info
index f6dd0277e187f375c92705624d7dd126ea7c89f3..ddff95e8739e671e38a1c8b7d7e530d2d9e52aed 100644
--- a/modules/overlay/overlay.info
+++ b/modules/overlay/overlay.info
@@ -4,8 +4,8 @@ package = Core
 version = VERSION
 core = 7.x
 
-; Information added by drupal.org packaging script on 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
 project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
 
diff --git a/modules/path/path.info b/modules/path/path.info
index 8e79a1e721f21aabd05d349e00de7429b9793862..711398295bdd8d029a18b2fbafc2726e4f1c77b6 100644
--- a/modules/path/path.info
+++ b/modules/path/path.info
@@ -6,8 +6,8 @@ core = 7.x
 files[] = path.test
 configure = admin/config/search/path
 
-; Information added by drupal.org packaging script on 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
 project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
 
diff --git a/modules/php/php.info b/modules/php/php.info
index 5409ab1080a2d0d0a5692edb8f521b4bdbc49a51..b746670cf912d9b73f745314b9b094c0a940c352 100644
--- a/modules/php/php.info
+++ b/modules/php/php.info
@@ -5,8 +5,8 @@ version = VERSION
 core = 7.x
 files[] = php.test
 
-; Information added by drupal.org packaging script on 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
 project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
 
diff --git a/modules/poll/poll.info b/modules/poll/poll.info
index 2c1536ce7bc3a9afe4dc9330e00fda97fccdcf54..57f959ccbfa80d5f6bc2162cea9c30eaaaaea108 100644
--- a/modules/poll/poll.info
+++ b/modules/poll/poll.info
@@ -6,8 +6,8 @@ core = 7.x
 files[] = poll.test
 stylesheets[all][] = poll.css
 
-; Information added by drupal.org packaging script on 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
 project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
 
diff --git a/modules/profile/profile.info b/modules/profile/profile.info
index 051ad84be1e715f11768243eed56b9ca2cd12206..f9b92c47a85c6e3ab61e6ae060813ad2137c79f2 100644
--- a/modules/profile/profile.info
+++ b/modules/profile/profile.info
@@ -11,8 +11,8 @@ configure = admin/config/people/profile
 ; See user_system_info_alter().
 hidden = TRUE
 
-; Information added by drupal.org packaging script on 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
 project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
 
diff --git a/modules/rdf/rdf.info b/modules/rdf/rdf.info
index 6b0e523dd2b17c4d43479e105aa854b49d99897f..60688d4bfeeb53a23f240d802044c8962f5f75b4 100644
--- a/modules/rdf/rdf.info
+++ b/modules/rdf/rdf.info
@@ -5,8 +5,8 @@ version = VERSION
 core = 7.x
 files[] = rdf.test
 
-; Information added by drupal.org packaging script on 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
 project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
 
diff --git a/modules/rdf/tests/rdf_test.info b/modules/rdf/tests/rdf_test.info
index 0dbbce8bf06eb1701bec37f558fd7860c622bd84..4b244f697c96f75f1bfa26130170bae79534c2a9 100644
--- a/modules/rdf/tests/rdf_test.info
+++ b/modules/rdf/tests/rdf_test.info
@@ -5,8 +5,8 @@ version = VERSION
 core = 7.x
 hidden = TRUE
 
-; Information added by drupal.org packaging script on 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
 project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
 
diff --git a/modules/search/search.info b/modules/search/search.info
index 25271b996344b958fa729f9dae519e9fd4829d6c..c74d9ede75a619b674750317eb7451a6f8c0f144 100644
--- a/modules/search/search.info
+++ b/modules/search/search.info
@@ -8,8 +8,8 @@ files[] = search.test
 configure = admin/config/search/settings
 stylesheets[all][] = search.css
 
-; Information added by drupal.org packaging script on 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
 project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
 
diff --git a/modules/search/tests/search_embedded_form.info b/modules/search/tests/search_embedded_form.info
index 2c48e471ee98ca44c0d8fdfe40bd3c0b62adbc06..780a6ccdc44bfa049e2066bbf5af3f9e3ace84cf 100644
--- a/modules/search/tests/search_embedded_form.info
+++ b/modules/search/tests/search_embedded_form.info
@@ -5,8 +5,8 @@ version = VERSION
 core = 7.x
 hidden = TRUE
 
-; Information added by drupal.org packaging script on 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
 project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
 
diff --git a/modules/search/tests/search_extra_type.info b/modules/search/tests/search_extra_type.info
index 208fb6d31ed38553cb18bde37207c677ba07d470..063dbbc47f536172de57d833fbc1384307bd73b1 100644
--- a/modules/search/tests/search_extra_type.info
+++ b/modules/search/tests/search_extra_type.info
@@ -5,8 +5,8 @@ version = VERSION
 core = 7.x
 hidden = TRUE
 
-; Information added by drupal.org packaging script on 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
 project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
 
diff --git a/modules/shortcut/shortcut.info b/modules/shortcut/shortcut.info
index cc741e188f0e611b98ea5290936f1b1be0188a7a..02602675d919e8fa55c32e40f17b78cc7afe2380 100644
--- a/modules/shortcut/shortcut.info
+++ b/modules/shortcut/shortcut.info
@@ -6,8 +6,8 @@ core = 7.x
 files[] = shortcut.test
 configure = admin/config/user-interface/shortcut
 
-; Information added by drupal.org packaging script on 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
 project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
 
diff --git a/modules/simpletest/simpletest.info b/modules/simpletest/simpletest.info
index b9a77fc6cd86d630a5f0ca426d3ee22b030244d2..4fb1d1b85103cfdc332c76f3daf09bbc4414405a 100644
--- a/modules/simpletest/simpletest.info
+++ b/modules/simpletest/simpletest.info
@@ -55,8 +55,8 @@ files[] = tests/upgrade/update.trigger.test
 files[] = tests/upgrade/update.field.test
 files[] = tests/upgrade/update.user.test
 
-; Information added by drupal.org packaging script on 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
 project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
 
diff --git a/modules/simpletest/tests/actions_loop_test.info b/modules/simpletest/tests/actions_loop_test.info
index 6efd837dd7960a442e31b359515acf18dda818be..75ed026777aae84c043d2bdf2abc5cbf8f55c46a 100644
--- a/modules/simpletest/tests/actions_loop_test.info
+++ b/modules/simpletest/tests/actions_loop_test.info
@@ -5,8 +5,8 @@ version = VERSION
 core = 7.x
 hidden = TRUE
 
-; Information added by drupal.org packaging script on 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
 project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
 
diff --git a/modules/simpletest/tests/ajax_forms_test.info b/modules/simpletest/tests/ajax_forms_test.info
index 6b93949f83028f9f026b0890bf35247397ddb72a..bd25b8453ab477e37f9dcc4120717e9ea9edb5ee 100644
--- a/modules/simpletest/tests/ajax_forms_test.info
+++ b/modules/simpletest/tests/ajax_forms_test.info
@@ -5,8 +5,8 @@ package = Testing
 version = VERSION
 hidden = TRUE
 
-; Information added by drupal.org packaging script on 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
 project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
 
diff --git a/modules/simpletest/tests/ajax_test.info b/modules/simpletest/tests/ajax_test.info
index ef9b93f843bfa6bc83515221adc36ac4441ec4e1..94c1232cf7146ea5f33b7ab8aed14c6b670e5060 100644
--- a/modules/simpletest/tests/ajax_test.info
+++ b/modules/simpletest/tests/ajax_test.info
@@ -5,8 +5,8 @@ version = VERSION
 core = 7.x
 hidden = TRUE
 
-; Information added by drupal.org packaging script on 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
 project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
 
diff --git a/modules/simpletest/tests/batch_test.info b/modules/simpletest/tests/batch_test.info
index 6ded129f4769e4370f7be4fd8cf671a28be18596..ef1d5494f65ad843725192489e26da1082ab6cdf 100644
--- a/modules/simpletest/tests/batch_test.info
+++ b/modules/simpletest/tests/batch_test.info
@@ -5,8 +5,8 @@ version = VERSION
 core = 7.x
 hidden = TRUE
 
-; Information added by drupal.org packaging script on 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
 project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
 
diff --git a/modules/simpletest/tests/common_test.info b/modules/simpletest/tests/common_test.info
index b999bb0682bfa6447ef710a4b4d32999c777b872..401258e0dd362c4b8f8faa271a4f31cd42e35e3b 100644
--- a/modules/simpletest/tests/common_test.info
+++ b/modules/simpletest/tests/common_test.info
@@ -7,8 +7,8 @@ stylesheets[all][] = common_test.css
 stylesheets[print][] = common_test.print.css
 hidden = TRUE
 
-; Information added by drupal.org packaging script on 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
 project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
 
diff --git a/modules/simpletest/tests/common_test_cron_helper.info b/modules/simpletest/tests/common_test_cron_helper.info
index 0ccf87db31247c3648e4afcd2283ee4ea905f6a2..aefed486da6524bf808572378e044db8c4d2bb08 100644
--- a/modules/simpletest/tests/common_test_cron_helper.info
+++ b/modules/simpletest/tests/common_test_cron_helper.info
@@ -5,8 +5,8 @@ version = VERSION
 core = 7.x
 hidden = TRUE
 
-; Information added by drupal.org packaging script on 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
 project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
 
diff --git a/modules/simpletest/tests/database_test.info b/modules/simpletest/tests/database_test.info
index 1e2a3ea012a455d9b5281bbd7f59fbf4e00a2266..1dc0f8883acb44855cd6215bfcbdcfbd25c88792 100644
--- a/modules/simpletest/tests/database_test.info
+++ b/modules/simpletest/tests/database_test.info
@@ -5,8 +5,8 @@ package = Testing
 version = VERSION
 hidden = TRUE
 
-; Information added by drupal.org packaging script on 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
 project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
 
diff --git a/modules/simpletest/tests/drupal_system_listing_compatible_test/drupal_system_listing_compatible_test.info b/modules/simpletest/tests/drupal_system_listing_compatible_test/drupal_system_listing_compatible_test.info
index 07a44a1439ce091d0faac95065b2065485240a70..db0405ebcc21cbcb26032b78898cd9a56b08c1ef 100644
--- a/modules/simpletest/tests/drupal_system_listing_compatible_test/drupal_system_listing_compatible_test.info
+++ b/modules/simpletest/tests/drupal_system_listing_compatible_test/drupal_system_listing_compatible_test.info
@@ -5,8 +5,8 @@ version = VERSION
 core = 7.x
 hidden = TRUE
 
-; Information added by drupal.org packaging script on 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
 project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
 
diff --git a/modules/simpletest/tests/drupal_system_listing_incompatible_test/drupal_system_listing_incompatible_test.info b/modules/simpletest/tests/drupal_system_listing_incompatible_test/drupal_system_listing_incompatible_test.info
index 1ad4e306b6ba9d4af8aed9728331345ab799307f..dd3461ca8139be6687721ca2c8e3fca27aca954a 100644
--- a/modules/simpletest/tests/drupal_system_listing_incompatible_test/drupal_system_listing_incompatible_test.info
+++ b/modules/simpletest/tests/drupal_system_listing_incompatible_test/drupal_system_listing_incompatible_test.info
@@ -5,8 +5,8 @@ version = VERSION
 core = 7.x
 hidden = TRUE
 
-; Information added by drupal.org packaging script on 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
 project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
 
diff --git a/modules/simpletest/tests/entity_cache_test.info b/modules/simpletest/tests/entity_cache_test.info
index c2f02075aff1a2e9d77c36f8e7c068b19ed4b17b..f3070bd7418e6c6884653c669afc0464c05640f5 100644
--- a/modules/simpletest/tests/entity_cache_test.info
+++ b/modules/simpletest/tests/entity_cache_test.info
@@ -6,8 +6,8 @@ core = 7.x
 dependencies[] = entity_cache_test_dependency
 hidden = TRUE
 
-; Information added by drupal.org packaging script on 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
 project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
 
diff --git a/modules/simpletest/tests/entity_cache_test_dependency.info b/modules/simpletest/tests/entity_cache_test_dependency.info
index 71018af312918d1d2a0012a9771ed25992573ccb..afe49650b605f9b4f7124d6ac59997a7f90ea94c 100644
--- a/modules/simpletest/tests/entity_cache_test_dependency.info
+++ b/modules/simpletest/tests/entity_cache_test_dependency.info
@@ -5,8 +5,8 @@ version = VERSION
 core = 7.x
 hidden = TRUE
 
-; Information added by drupal.org packaging script on 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
 project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
 
diff --git a/modules/simpletest/tests/entity_crud_hook_test.info b/modules/simpletest/tests/entity_crud_hook_test.info
index 9540f9ac64f48c3bd5739776e0edbc1802ad9554..70e106a81fb9bbe68e2426b6974e65dc8e9e3c46 100644
--- a/modules/simpletest/tests/entity_crud_hook_test.info
+++ b/modules/simpletest/tests/entity_crud_hook_test.info
@@ -5,8 +5,8 @@ package = Testing
 version = VERSION
 hidden = TRUE
 
-; Information added by drupal.org packaging script on 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
 project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
 
diff --git a/modules/simpletest/tests/entity_query_access_test.info b/modules/simpletest/tests/entity_query_access_test.info
index e5437532cdec95f056ff64e1e965ac79cbf02474..2e9915a2db0eb9a14079a239fe722e056dd6579a 100644
--- a/modules/simpletest/tests/entity_query_access_test.info
+++ b/modules/simpletest/tests/entity_query_access_test.info
@@ -5,8 +5,8 @@ version = VERSION
 core = 7.x
 hidden = TRUE
 
-; Information added by drupal.org packaging script on 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
 project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
 
diff --git a/modules/simpletest/tests/error_test.info b/modules/simpletest/tests/error_test.info
index 12a5a51ba953f10a1dcc68c08dea63e54031e1e3..7f7d483924bacc301741e3bd0649bb7b131be1fd 100644
--- a/modules/simpletest/tests/error_test.info
+++ b/modules/simpletest/tests/error_test.info
@@ -5,8 +5,8 @@ version = VERSION
 core = 7.x
 hidden = TRUE
 
-; Information added by drupal.org packaging script on 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
 project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
 
diff --git a/modules/simpletest/tests/file_test.info b/modules/simpletest/tests/file_test.info
index b7b7619724215fc195a9812a99813eea66d8cff8..f75c65b8812bd8f0f7914c7a6c5e9701231f0dc2 100644
--- a/modules/simpletest/tests/file_test.info
+++ b/modules/simpletest/tests/file_test.info
@@ -6,8 +6,8 @@ core = 7.x
 files[] = file_test.module
 hidden = TRUE
 
-; Information added by drupal.org packaging script on 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
 project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
 
diff --git a/modules/simpletest/tests/filter_test.info b/modules/simpletest/tests/filter_test.info
index 9f58a303953a05e1aebb3f4955d574b172d91992..647ab930f74556c48a82a09f1b48b7915190b31e 100644
--- a/modules/simpletest/tests/filter_test.info
+++ b/modules/simpletest/tests/filter_test.info
@@ -5,8 +5,8 @@ version = VERSION
 core = 7.x
 hidden = TRUE
 
-; Information added by drupal.org packaging script on 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
 project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
 
diff --git a/modules/simpletest/tests/form_test.info b/modules/simpletest/tests/form_test.info
index a5be94b8c86c59285f529b89c83465ed76a62ad0..84e8337ceb1a16d6e85158364d5a8bfd0c7dbaee 100644
--- a/modules/simpletest/tests/form_test.info
+++ b/modules/simpletest/tests/form_test.info
@@ -5,8 +5,8 @@ version = VERSION
 core = 7.x
 hidden = TRUE
 
-; Information added by drupal.org packaging script on 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
 project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
 
diff --git a/modules/simpletest/tests/image_test.info b/modules/simpletest/tests/image_test.info
index f3b342290b0494077784cca42642d1c17228dd74..88a14e9050b9abaa00df61562a1ac21a7b1ff7b0 100644
--- a/modules/simpletest/tests/image_test.info
+++ b/modules/simpletest/tests/image_test.info
@@ -5,8 +5,8 @@ version = VERSION
 core = 7.x
 hidden = TRUE
 
-; Information added by drupal.org packaging script on 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
 project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
 
diff --git a/modules/simpletest/tests/menu_test.info b/modules/simpletest/tests/menu_test.info
index 1b9c676bef2d6929ad47ce8066a4afe69ecc7bd9..f757fa649dbeac05c4b39471e1ce34416febf78a 100644
--- a/modules/simpletest/tests/menu_test.info
+++ b/modules/simpletest/tests/menu_test.info
@@ -5,8 +5,8 @@ version = VERSION
 core = 7.x
 hidden = TRUE
 
-; Information added by drupal.org packaging script on 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
 project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
 
diff --git a/modules/simpletest/tests/module_test.info b/modules/simpletest/tests/module_test.info
index e591d354c2f6a5df3e57bc2fdc4b174f17f087aa..69f0e863f0caf7c7c1a1e5ceade47184c8ef1135 100644
--- a/modules/simpletest/tests/module_test.info
+++ b/modules/simpletest/tests/module_test.info
@@ -5,8 +5,8 @@ version = VERSION
 core = 7.x
 hidden = TRUE
 
-; Information added by drupal.org packaging script on 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
 project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
 
diff --git a/modules/simpletest/tests/path_test.info b/modules/simpletest/tests/path_test.info
index 94c850841d80601022d527f45df394be64088f9c..0b4a56e8e3fd884e6d82cb50ea958ea061a0f54f 100644
--- a/modules/simpletest/tests/path_test.info
+++ b/modules/simpletest/tests/path_test.info
@@ -5,8 +5,8 @@ version = VERSION
 core = 7.x
 hidden = TRUE
 
-; Information added by drupal.org packaging script on 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
 project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
 
diff --git a/modules/simpletest/tests/requirements1_test.info b/modules/simpletest/tests/requirements1_test.info
index 855ada58dedbb83186db77f6e310d441a1b90222..0abd16ada9c911d2301b6454cfc4a4b7295927d2 100644
--- a/modules/simpletest/tests/requirements1_test.info
+++ b/modules/simpletest/tests/requirements1_test.info
@@ -5,8 +5,8 @@ version = VERSION
 core = 7.x
 hidden = TRUE
 
-; Information added by drupal.org packaging script on 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
 project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
 
diff --git a/modules/simpletest/tests/requirements2_test.info b/modules/simpletest/tests/requirements2_test.info
index f1d5886de562aa7363e2b077582e51e8161f4c72..3e16727f6e7dd7014a049cd14edbee136c09f1ae 100644
--- a/modules/simpletest/tests/requirements2_test.info
+++ b/modules/simpletest/tests/requirements2_test.info
@@ -7,8 +7,8 @@ version = VERSION
 core = 7.x
 hidden = TRUE
 
-; Information added by drupal.org packaging script on 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
 project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
 
diff --git a/modules/simpletest/tests/session_test.info b/modules/simpletest/tests/session_test.info
index 35b2f7f528f599ccd26666b0dba985ebc74d733e..ed5da5c30bc2246ad311866f20039fdfa404b6f8 100644
--- a/modules/simpletest/tests/session_test.info
+++ b/modules/simpletest/tests/session_test.info
@@ -5,8 +5,8 @@ version = VERSION
 core = 7.x
 hidden = TRUE
 
-; Information added by drupal.org packaging script on 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
 project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
 
diff --git a/modules/simpletest/tests/system_dependencies_test.info b/modules/simpletest/tests/system_dependencies_test.info
index 09e49cb82861e851668666a94bd0ae8610277aa9..c9530ec12bbc76da1b9bc231e5925d0dc16798ab 100644
--- a/modules/simpletest/tests/system_dependencies_test.info
+++ b/modules/simpletest/tests/system_dependencies_test.info
@@ -6,8 +6,8 @@ core = 7.x
 hidden = TRUE
 dependencies[] = _missing_dependency
 
-; Information added by drupal.org packaging script on 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
 project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
 
diff --git a/modules/simpletest/tests/system_incompatible_core_version_dependencies_test.info b/modules/simpletest/tests/system_incompatible_core_version_dependencies_test.info
index 03de8dd7367cf08334ab353492f840fb6700bb3e..8b02132829e97dd7f0bc4a125bc0d15f54155a09 100644
--- a/modules/simpletest/tests/system_incompatible_core_version_dependencies_test.info
+++ b/modules/simpletest/tests/system_incompatible_core_version_dependencies_test.info
@@ -6,8 +6,8 @@ core = 7.x
 hidden = TRUE
 dependencies[] = system_incompatible_core_version_test
 
-; Information added by drupal.org packaging script on 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
 project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
 
diff --git a/modules/simpletest/tests/system_incompatible_core_version_test.info b/modules/simpletest/tests/system_incompatible_core_version_test.info
index 98f045a3af4d6e2c0a106fce81906ac4de45c473..27ecee1b1266becb735517891db83fa6664b4600 100644
--- a/modules/simpletest/tests/system_incompatible_core_version_test.info
+++ b/modules/simpletest/tests/system_incompatible_core_version_test.info
@@ -5,8 +5,8 @@ version = VERSION
 core = 5.x
 hidden = TRUE
 
-; Information added by drupal.org packaging script on 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
 project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
 
diff --git a/modules/simpletest/tests/system_incompatible_module_version_dependencies_test.info b/modules/simpletest/tests/system_incompatible_module_version_dependencies_test.info
index 5cba8c5c8db75b9706dfe7dc3df94d5dbb36a32e..0dd13395e52ce99c6cf2ce58ecdfae47d7075057 100644
--- a/modules/simpletest/tests/system_incompatible_module_version_dependencies_test.info
+++ b/modules/simpletest/tests/system_incompatible_module_version_dependencies_test.info
@@ -7,8 +7,8 @@ hidden = TRUE
 ; system_incompatible_module_version_test declares version 1.0
 dependencies[] = system_incompatible_module_version_test (>2.0)
 
-; Information added by drupal.org packaging script on 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
 project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
 
diff --git a/modules/simpletest/tests/system_incompatible_module_version_test.info b/modules/simpletest/tests/system_incompatible_module_version_test.info
index 229df45544a949749fd20101edba9332fccbb19a..e1eac2534a6ed940b4eb0c970d6b887f2d0ef084 100644
--- a/modules/simpletest/tests/system_incompatible_module_version_test.info
+++ b/modules/simpletest/tests/system_incompatible_module_version_test.info
@@ -5,8 +5,8 @@ version = 1.0
 core = 7.x
 hidden = TRUE
 
-; Information added by drupal.org packaging script on 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
 project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
 
diff --git a/modules/simpletest/tests/system_test.info b/modules/simpletest/tests/system_test.info
index f88b575abccaaf87380311288b3b7b5cbcab2fa1..17e41157781f6684f4fa52f0a48a044a51f6ae68 100644
--- a/modules/simpletest/tests/system_test.info
+++ b/modules/simpletest/tests/system_test.info
@@ -6,8 +6,8 @@ core = 7.x
 files[] = system_test.module
 hidden = TRUE
 
-; Information added by drupal.org packaging script on 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
 project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
 
diff --git a/modules/simpletest/tests/taxonomy_test.info b/modules/simpletest/tests/taxonomy_test.info
index 4b36f5508f35a9cfdc5a256c057be69056bd82df..b3d3910a90142477f818737d4358829ee467b0c8 100644
--- a/modules/simpletest/tests/taxonomy_test.info
+++ b/modules/simpletest/tests/taxonomy_test.info
@@ -6,8 +6,8 @@ core = 7.x
 hidden = TRUE
 dependencies[] = taxonomy
 
-; Information added by drupal.org packaging script on 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
 project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
 
diff --git a/modules/simpletest/tests/theme_test.info b/modules/simpletest/tests/theme_test.info
index b76dee573247f167ba64d14499f7a14345d353b5..691529843b04e6001d5c9c17e4c6d4e378747347 100644
--- a/modules/simpletest/tests/theme_test.info
+++ b/modules/simpletest/tests/theme_test.info
@@ -5,8 +5,8 @@ version = VERSION
 core = 7.x
 hidden = TRUE
 
-; Information added by drupal.org packaging script on 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
 project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
 
diff --git a/modules/simpletest/tests/themes/test_basetheme/test_basetheme.info b/modules/simpletest/tests/themes/test_basetheme/test_basetheme.info
index 97553613c24e73d933df3eae9ef71c9427efdac4..8bf651e360e2a3a113dae51611fbff71fe3a2691 100644
--- a/modules/simpletest/tests/themes/test_basetheme/test_basetheme.info
+++ b/modules/simpletest/tests/themes/test_basetheme/test_basetheme.info
@@ -6,8 +6,8 @@ hidden = TRUE
 settings[basetheme_only] = base theme value
 settings[subtheme_override] = base theme value
 
-; Information added by drupal.org packaging script on 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
 project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
 
diff --git a/modules/simpletest/tests/themes/test_subtheme/test_subtheme.info b/modules/simpletest/tests/themes/test_subtheme/test_subtheme.info
index 082f782ea395836743c60ee3673969c93f87a8c5..74a8603c92425163a1790ab2981d970e660c91e5 100644
--- a/modules/simpletest/tests/themes/test_subtheme/test_subtheme.info
+++ b/modules/simpletest/tests/themes/test_subtheme/test_subtheme.info
@@ -6,8 +6,8 @@ hidden = TRUE
 
 settings[subtheme_override] = subtheme value
 
-; Information added by drupal.org packaging script on 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
 project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
 
diff --git a/modules/simpletest/tests/themes/test_theme/test_theme.info b/modules/simpletest/tests/themes/test_theme/test_theme.info
index fa187353885db612da028e83add1bf4988e58656..c0c455f052f5189e2b182bde6206f59ad5d67b8d 100644
--- a/modules/simpletest/tests/themes/test_theme/test_theme.info
+++ b/modules/simpletest/tests/themes/test_theme/test_theme.info
@@ -17,8 +17,8 @@ stylesheets[all][] = system.base.css
 
 settings[theme_test_setting] = default value
 
-; Information added by drupal.org packaging script on 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
 project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
 
diff --git a/modules/simpletest/tests/update_script_test.info b/modules/simpletest/tests/update_script_test.info
index 3a240fe769d822b721fc06a9dc85a2d90cc70e26..79132f44038ca1fc2438be7f58baa2450dfb1995 100644
--- a/modules/simpletest/tests/update_script_test.info
+++ b/modules/simpletest/tests/update_script_test.info
@@ -5,8 +5,8 @@ version = VERSION
 core = 7.x
 hidden = TRUE
 
-; Information added by drupal.org packaging script on 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
 project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
 
diff --git a/modules/simpletest/tests/update_test_1.info b/modules/simpletest/tests/update_test_1.info
index c4febe3d2c1409bf4d67e7e4434234e0d171a4f2..dc589a6f36c9bea1d3860436e6ad51a26f051674 100644
--- a/modules/simpletest/tests/update_test_1.info
+++ b/modules/simpletest/tests/update_test_1.info
@@ -5,8 +5,8 @@ version = VERSION
 core = 7.x
 hidden = TRUE
 
-; Information added by drupal.org packaging script on 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
 project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
 
diff --git a/modules/simpletest/tests/update_test_2.info b/modules/simpletest/tests/update_test_2.info
index c4febe3d2c1409bf4d67e7e4434234e0d171a4f2..dc589a6f36c9bea1d3860436e6ad51a26f051674 100644
--- a/modules/simpletest/tests/update_test_2.info
+++ b/modules/simpletest/tests/update_test_2.info
@@ -5,8 +5,8 @@ version = VERSION
 core = 7.x
 hidden = TRUE
 
-; Information added by drupal.org packaging script on 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
 project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
 
diff --git a/modules/simpletest/tests/update_test_3.info b/modules/simpletest/tests/update_test_3.info
index c4febe3d2c1409bf4d67e7e4434234e0d171a4f2..dc589a6f36c9bea1d3860436e6ad51a26f051674 100644
--- a/modules/simpletest/tests/update_test_3.info
+++ b/modules/simpletest/tests/update_test_3.info
@@ -5,8 +5,8 @@ version = VERSION
 core = 7.x
 hidden = TRUE
 
-; Information added by drupal.org packaging script on 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
 project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
 
diff --git a/modules/simpletest/tests/url_alter_test.info b/modules/simpletest/tests/url_alter_test.info
index d7fe962cf9fbe2fcdefd4c14c071ebb667066c23..48b6c6d67d942afc7b1305f4bf5775e9c6c81e91 100644
--- a/modules/simpletest/tests/url_alter_test.info
+++ b/modules/simpletest/tests/url_alter_test.info
@@ -5,8 +5,8 @@ package = Testing
 version = VERSION
 hidden = TRUE
 
-; Information added by drupal.org packaging script on 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
 project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
 
diff --git a/modules/simpletest/tests/xmlrpc_test.info b/modules/simpletest/tests/xmlrpc_test.info
index b6a3cc49e6a2fe4d4206a5293b326a27ac87e0be..f1b9cb78f05bc31da14397e771f5f8dc164f1dcc 100644
--- a/modules/simpletest/tests/xmlrpc_test.info
+++ b/modules/simpletest/tests/xmlrpc_test.info
@@ -5,8 +5,8 @@ version = VERSION
 core = 7.x
 hidden = TRUE
 
-; Information added by drupal.org packaging script on 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
 project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
 
diff --git a/modules/statistics/statistics.info b/modules/statistics/statistics.info
index 628a94efbbe384df01eb2828709ea5fb43ecc5bc..bf0baf8e5a335c6a9f1e49a4e25e92f856e01950 100644
--- a/modules/statistics/statistics.info
+++ b/modules/statistics/statistics.info
@@ -6,8 +6,8 @@ core = 7.x
 files[] = statistics.test
 configure = admin/config/system/statistics
 
-; Information added by drupal.org packaging script on 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
 project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
 
diff --git a/modules/syslog/syslog.info b/modules/syslog/syslog.info
index 963d87c5e6def619deb9087dfa7e483e214450b2..0e4891f1937cf6fa1a393e24a778daf1aaf85609 100644
--- a/modules/syslog/syslog.info
+++ b/modules/syslog/syslog.info
@@ -5,8 +5,8 @@ version = VERSION
 core = 7.x
 files[] = syslog.test
 
-; Information added by drupal.org packaging script on 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
 project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
 
diff --git a/modules/system/system.info b/modules/system/system.info
index fab267a7107928aeb05524e5a0fa9e1c2669b0ee..06ac454c32ada9946764708297db73c9accebee0 100644
--- a/modules/system/system.info
+++ b/modules/system/system.info
@@ -12,8 +12,8 @@ files[] = system.test
 required = TRUE
 configure = admin/config/system
 
-; Information added by drupal.org packaging script on 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
 project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
 
diff --git a/modules/taxonomy/taxonomy.info b/modules/taxonomy/taxonomy.info
index 2a565ab05cd1bab6962f4afce5fc2c5e941e7c93..838aeb25ed3a6699b00380efcd7b1888c76bd651 100644
--- a/modules/taxonomy/taxonomy.info
+++ b/modules/taxonomy/taxonomy.info
@@ -8,8 +8,8 @@ files[] = taxonomy.module
 files[] = taxonomy.test
 configure = admin/structure/taxonomy
 
-; Information added by drupal.org packaging script on 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
 project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
 
diff --git a/modules/toolbar/toolbar.info b/modules/toolbar/toolbar.info
index 3191b5f5316b428d783e4ae3f583fbf3de6ea6ee..6e2632acd1fe41de326d6b6f4a9b7cdb4dc25c35 100644
--- a/modules/toolbar/toolbar.info
+++ b/modules/toolbar/toolbar.info
@@ -4,8 +4,8 @@ core = 7.x
 package = Core
 version = VERSION
 
-; Information added by drupal.org packaging script on 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
 project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
 
diff --git a/modules/tracker/tracker.info b/modules/tracker/tracker.info
index d3d8706cd635af4582ee9b85f2eaa732a2552d64..e4f971eaf235804c92fa35f7391f4497dba8f263 100644
--- a/modules/tracker/tracker.info
+++ b/modules/tracker/tracker.info
@@ -6,8 +6,8 @@ version = VERSION
 core = 7.x
 files[] = tracker.test
 
-; Information added by drupal.org packaging script on 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
 project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
 
diff --git a/modules/translation/tests/translation_test.info b/modules/translation/tests/translation_test.info
index d11abcf95b33bc16257c36f944606a308d8f8810..eade14ce9994cf09f18114c3f51c0b5b5b3b0ac8 100644
--- a/modules/translation/tests/translation_test.info
+++ b/modules/translation/tests/translation_test.info
@@ -5,8 +5,8 @@ package = Testing
 version = VERSION
 hidden = TRUE
 
-; Information added by drupal.org packaging script on 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
 project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
 
diff --git a/modules/translation/translation.info b/modules/translation/translation.info
index 1449c7adf6beea40b64f545f1ee3cb47392acf8b..100cbcd0d4a856673f28eede99aaf38ea89d3d88 100644
--- a/modules/translation/translation.info
+++ b/modules/translation/translation.info
@@ -6,8 +6,8 @@ version = VERSION
 core = 7.x
 files[] = translation.test
 
-; Information added by drupal.org packaging script on 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
 project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
 
diff --git a/modules/trigger/tests/trigger_test.info b/modules/trigger/tests/trigger_test.info
index 5067e6a8bf46c45c945c4da2ae7600eb45125b1d..b58a74004f7db6ad613617177b52df840e9e0dbe 100644
--- a/modules/trigger/tests/trigger_test.info
+++ b/modules/trigger/tests/trigger_test.info
@@ -4,8 +4,8 @@ package = Testing
 core = 7.x
 hidden = TRUE
 
-; Information added by drupal.org packaging script on 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
 project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
 
diff --git a/modules/trigger/trigger.info b/modules/trigger/trigger.info
index 222b382826acd31bda3c982385e222b578a81690..e8ba827e320feb3cb8aca72879424efaf45812b0 100644
--- a/modules/trigger/trigger.info
+++ b/modules/trigger/trigger.info
@@ -6,8 +6,8 @@ core = 7.x
 files[] = trigger.test
 configure = admin/structure/trigger
 
-; Information added by drupal.org packaging script on 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
 project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
 
diff --git a/modules/update/tests/aaa_update_test.info b/modules/update/tests/aaa_update_test.info
index 7c5179a23f0a8e295e97526236fe9d222645fa5d..2b7d4088808e4ec4e985e9ddeca2e246eee86eea 100644
--- a/modules/update/tests/aaa_update_test.info
+++ b/modules/update/tests/aaa_update_test.info
@@ -4,8 +4,8 @@ package = Testing
 core = 7.x
 hidden = TRUE
 
-; Information added by drupal.org packaging script on 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
 project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
 
diff --git a/modules/update/tests/bbb_update_test.info b/modules/update/tests/bbb_update_test.info
index d88c1fe9df4ae0ca574cd2a2e90a438eb1142105..f611371f7af35aa2f03aad6209412d737a3d22da 100644
--- a/modules/update/tests/bbb_update_test.info
+++ b/modules/update/tests/bbb_update_test.info
@@ -4,8 +4,8 @@ package = Testing
 core = 7.x
 hidden = TRUE
 
-; Information added by drupal.org packaging script on 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
 project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
 
diff --git a/modules/update/tests/ccc_update_test.info b/modules/update/tests/ccc_update_test.info
index 591af8fbc4a8f8380ad2724befffcae6ddd1b8b9..9233d47c4530670dba187a5305e35d68c5d5cfb5 100644
--- a/modules/update/tests/ccc_update_test.info
+++ b/modules/update/tests/ccc_update_test.info
@@ -4,8 +4,8 @@ package = Testing
 core = 7.x
 hidden = TRUE
 
-; Information added by drupal.org packaging script on 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
 project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
 
diff --git a/modules/update/tests/themes/update_test_basetheme/update_test_basetheme.info b/modules/update/tests/themes/update_test_basetheme/update_test_basetheme.info
index 9e92226dcffaa9e457e9570f031e796965fd7fa9..64c3758bd5fa2555f7c1e6d36c78e5c07bb264f8 100644
--- a/modules/update/tests/themes/update_test_basetheme/update_test_basetheme.info
+++ b/modules/update/tests/themes/update_test_basetheme/update_test_basetheme.info
@@ -3,8 +3,8 @@ description = Test theme which acts as a base theme for other test subthemes.
 core = 7.x
 hidden = TRUE
 
-; Information added by drupal.org packaging script on 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
 project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
 
diff --git a/modules/update/tests/themes/update_test_subtheme/update_test_subtheme.info b/modules/update/tests/themes/update_test_subtheme/update_test_subtheme.info
index 3dca01d4767c4526806e3afc754a9bf3d4c02d9d..ff9598194865e54140fb38a45955255ffc31aaab 100644
--- a/modules/update/tests/themes/update_test_subtheme/update_test_subtheme.info
+++ b/modules/update/tests/themes/update_test_subtheme/update_test_subtheme.info
@@ -4,8 +4,8 @@ core = 7.x
 base theme = update_test_basetheme
 hidden = TRUE
 
-; Information added by drupal.org packaging script on 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
 project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
 
diff --git a/modules/update/tests/update_test.info b/modules/update/tests/update_test.info
index d6883aef67fb6791bd6b3444f25b95218cc916f0..30a8cb10d14f259181572d72e28b619f9a4f4c2a 100644
--- a/modules/update/tests/update_test.info
+++ b/modules/update/tests/update_test.info
@@ -5,8 +5,8 @@ version = VERSION
 core = 7.x
 hidden = TRUE
 
-; Information added by drupal.org packaging script on 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
 project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
 
diff --git a/modules/update/update.info b/modules/update/update.info
index f1a00def9ee7f4fd961037da8d523e4d2335c295..32ba01815a3a8e41e3390117d407966e33547c65 100644
--- a/modules/update/update.info
+++ b/modules/update/update.info
@@ -6,8 +6,8 @@ core = 7.x
 files[] = update.test
 configure = admin/reports/updates/settings
 
-; Information added by drupal.org packaging script on 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
 project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
 
diff --git a/modules/user/tests/user_form_test.info b/modules/user/tests/user_form_test.info
index 1b33a82d640b314a616905d8bc23cc8a90f1aab3..02331e7d701656243cafbf4e4b5d55abdc80d80c 100644
--- a/modules/user/tests/user_form_test.info
+++ b/modules/user/tests/user_form_test.info
@@ -5,8 +5,8 @@ version = VERSION
 core = 7.x
 hidden = TRUE
 
-; Information added by drupal.org packaging script on 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
 project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
 
diff --git a/modules/user/user.info b/modules/user/user.info
index 1f271a4951bcb521ae40ee2e407ed06b0883e9ce..1deef749bb5551ee89da9bf11b872a79d52444fa 100644
--- a/modules/user/user.info
+++ b/modules/user/user.info
@@ -9,8 +9,8 @@ required = TRUE
 configure = admin/config/people
 stylesheets[all][] = user.css
 
-; Information added by drupal.org packaging script on 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
 project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
 
diff --git a/modules/user/user.module b/modules/user/user.module
index 2c02f8ce921a6281c4a260d20dd6cda51c20a965..622fe4d256ee38dc1ea7ed8d5e58b4f8d339ebf7 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -933,14 +933,18 @@ function user_search_execute($keys = NULL, $conditions = NULL) {
   $query = db_select('users')->extend('PagerDefault');
   $query->fields('users', array('uid'));
   if (user_access('administer users')) {
-    // Administrators can also search in the otherwise private email field.
+    // Administrators can also search in the otherwise private email field,
+    // and they don't need to be restricted to only active users.
     $query->fields('users', array('mail'));
     $query->condition(db_or()->
       condition('name', '%' . db_like($keys) . '%', 'LIKE')->
       condition('mail', '%' . db_like($keys) . '%', 'LIKE'));
   }
   else {
-    $query->condition('name', '%' . db_like($keys) . '%', 'LIKE');
+    // Regular users can only search via usernames, and we do not show them
+    // blocked accounts.
+    $query->condition('name', '%' . db_like($keys) . '%', 'LIKE')
+      ->condition('status', 1);
   }
   $uids = $query
     ->limit(15)
diff --git a/modules/user/user.test b/modules/user/user.test
index 92af9fa9ab00512dae45eb9adaa1d209b15bea7f..123beee6c03d5be7db878b642d18e1426c78ba46 100644
--- a/modules/user/user.test
+++ b/modules/user/user.test
@@ -2106,7 +2106,7 @@ class UserUserSearchTestCase extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
       'name' => 'User search',
-      'description' => 'Testing that only user with the right permission can see the email address in the user search.',
+      'description' => 'Tests the user search page and verifies that sensitive information is hidden from unauthorized users.',
       'group' => 'User',
     );
   }
@@ -2126,11 +2126,29 @@ class UserUserSearchTestCase extends DrupalWebTestCase {
     $edit = array('keys' => $keys);
     $this->drupalPost('search/user/', $edit, t('Search'));
     $this->assertText($keys);
+
+    // Create a blocked user.
+    $blocked_user = $this->drupalCreateUser();
+    $edit = array('status' => 0);
+    $blocked_user = user_save($blocked_user, $edit);
+
+    // Verify that users with "administer users" permissions can see blocked
+    // accounts in search results.
+    $edit = array('keys' => $blocked_user->name);
+    $this->drupalPost('search/user/', $edit, t('Search'));
+    $this->assertText($blocked_user->name, 'Blocked users are listed on the user search results for users with the "administer users" permission.');
+
+    // Verify that users without "administer users" permissions do not see
+    // blocked accounts in search results.
+    $this->drupalLogin($user1);
+    $edit = array('keys' => $blocked_user->name);
+    $this->drupalPost('search/user/', $edit, t('Search'));
+    $this->assertNoText($blocked_user->name, 'Blocked users are hidden from the user search results.');
+
     $this->drupalLogout();
   }
 }
 
-
 /**
  * Test role assignment.
  */
diff --git a/profiles/minimal/minimal.info b/profiles/minimal/minimal.info
index 24df0c61da76fa07cd9fcbdeff2ce3c901b0c728..9f143c79557ed48780be99540b8f42125e31e3a4 100644
--- a/profiles/minimal/minimal.info
+++ b/profiles/minimal/minimal.info
@@ -5,8 +5,8 @@ core = 7.x
 dependencies[] = block
 dependencies[] = dblog
 
-; Information added by drupal.org packaging script on 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
 project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
 
diff --git a/profiles/standard/standard.info b/profiles/standard/standard.info
index ad397f4f49a96ab274a0d6156902d836466b54a4..2408b57f0dc1ab51e72ee7299e9a7d094b0f7a0b 100644
--- a/profiles/standard/standard.info
+++ b/profiles/standard/standard.info
@@ -24,8 +24,8 @@ dependencies[] = field_ui
 dependencies[] = file
 dependencies[] = rdf
 
-; Information added by drupal.org packaging script on 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
 project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
 
diff --git a/profiles/testing/modules/drupal_system_listing_compatible_test/drupal_system_listing_compatible_test.info b/profiles/testing/modules/drupal_system_listing_compatible_test/drupal_system_listing_compatible_test.info
index 4fcb81ea9f732571cef4f09de2a67959d8263798..537e6e4b8b12186c2b4513e076975c0af38d11b2 100644
--- a/profiles/testing/modules/drupal_system_listing_compatible_test/drupal_system_listing_compatible_test.info
+++ b/profiles/testing/modules/drupal_system_listing_compatible_test/drupal_system_listing_compatible_test.info
@@ -6,8 +6,8 @@ core = 7.x
 hidden = TRUE
 files[] = drupal_system_listing_compatible_test.test
 
-; Information added by drupal.org packaging script on 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
 project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
 
diff --git a/profiles/testing/modules/drupal_system_listing_incompatible_test/drupal_system_listing_incompatible_test.info b/profiles/testing/modules/drupal_system_listing_incompatible_test/drupal_system_listing_incompatible_test.info
index 068432fbb5cb4962f0f3eb1984b89ac69ec1a91e..36c2381ef168e8445b5045ba1451c83899571651 100644
--- a/profiles/testing/modules/drupal_system_listing_incompatible_test/drupal_system_listing_incompatible_test.info
+++ b/profiles/testing/modules/drupal_system_listing_incompatible_test/drupal_system_listing_incompatible_test.info
@@ -8,8 +8,8 @@ version = VERSION
 core = 6.x
 hidden = TRUE
 
-; Information added by drupal.org packaging script on 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
 project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
 
diff --git a/profiles/testing/testing.info b/profiles/testing/testing.info
index 124c9c045d5d3d9fcec648c6157a8eb246fa15cb..cc84bf43f1118540e243371aaa44883d79f8d52b 100644
--- a/profiles/testing/testing.info
+++ b/profiles/testing/testing.info
@@ -4,8 +4,8 @@ version = VERSION
 core = 7.x
 hidden = TRUE
 
-; Information added by drupal.org packaging script on 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
 project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
 
diff --git a/themes/bartik/bartik.info b/themes/bartik/bartik.info
index 96e95740ce2460fa72aabd512bce61cfeeef3bf7..3b3c37ec2d25005f19d0c059fbc7ca201a3cceff 100644
--- a/themes/bartik/bartik.info
+++ b/themes/bartik/bartik.info
@@ -34,8 +34,8 @@ regions[footer] = Footer
 settings[shortcut_module_link] = 0
 
 
-; Information added by drupal.org packaging script on 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
 project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
 
diff --git a/themes/garland/garland.info b/themes/garland/garland.info
index bfd7a17c9728b5bdfcca0b08c7d8d46bd953a70c..551660027682c2582c1bc9008b04d3f41af5ab30 100644
--- a/themes/garland/garland.info
+++ b/themes/garland/garland.info
@@ -7,8 +7,8 @@ stylesheets[all][] = style.css
 stylesheets[print][] = print.css
 settings[garland_width] = fluid
 
-; Information added by drupal.org packaging script on 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
 project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
 
diff --git a/themes/seven/seven.info b/themes/seven/seven.info
index 705e9f3a478576389ec6a237ec1ac5a24097909a..cb5d3d91f97480e9d4675ee2f2348a676f2d03c6 100644
--- a/themes/seven/seven.info
+++ b/themes/seven/seven.info
@@ -13,8 +13,8 @@ regions[page_bottom] = Page bottom
 regions[sidebar_first] = First sidebar
 regions_hidden[] = sidebar_first
 
-; Information added by drupal.org packaging script on 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
 project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
 
diff --git a/themes/stark/stark.info b/themes/stark/stark.info
index f60e470f07ce670925b044b08b7340b9f1846524..0e1475ce3346b44ceddf6be6f4482af2180c0d55 100644
--- a/themes/stark/stark.info
+++ b/themes/stark/stark.info
@@ -5,8 +5,8 @@ version = VERSION
 core = 7.x
 stylesheets[all][] = layout.css
 
-; Information added by drupal.org packaging script on 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
 project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"