--- 2084513-37.patch	2013-09-10 23:10:26.000000000 +0200
+++ D8-annotations-2084513-31.patch	2013-09-10 12:47:54.000000000 +0200
@@ -240,19 +240,19 @@
    }
  
 diff --git a/core/modules/block/lib/Drupal/block/Plugin/Type/BlockManager.php b/core/modules/block/lib/Drupal/block/Plugin/Type/BlockManager.php
-index 9c30cfb..639af44 100644
+index ead5531..0691c95 100644
 --- a/core/modules/block/lib/Drupal/block/Plugin/Type/BlockManager.php
 +++ b/core/modules/block/lib/Drupal/block/Plugin/Type/BlockManager.php
-@@ -52,8 +52,7 @@ class BlockManager extends DefaultPluginManager {
-    *   The translation manager.
+@@ -35,8 +35,7 @@ class BlockManager extends DefaultPluginManager {
+    *   The module handler to invoke the alter hook with.
     */
-   public function __construct(\Traversable $namespaces, CacheBackendInterface $cache_backend, LanguageManager $language_manager, ModuleHandlerInterface $module_handler, TranslationInterface $translation_manager) {
+   public function __construct(\Traversable $namespaces, CacheBackendInterface $cache_backend, LanguageManager $language_manager, ModuleHandlerInterface $module_handler) {
 -    $annotation_namespaces = array('Drupal\block\Annotation' => $namespaces['Drupal\block']);
 -    parent::__construct('Plugin/Block', $namespaces, $annotation_namespaces, 'Drupal\block\Annotation\Block');
 +    parent::__construct('Plugin/Block', $namespaces, 'Drupal\block\Annotation\Block');
- 
      $this->alterInfo($module_handler, 'block');
      $this->setCacheBackend($cache_backend, $language_manager, 'block_plugins');
+   }
 diff --git a/core/modules/ckeditor/lib/Drupal/ckeditor/CKEditorPluginManager.php b/core/modules/ckeditor/lib/Drupal/ckeditor/CKEditorPluginManager.php
 index dc69f7e..8c04cd2 100644
 --- a/core/modules/ckeditor/lib/Drupal/ckeditor/CKEditorPluginManager.php