commit 5ca82c810e7929f3f9c75aa4d08c9b3bd7bc0ff9
Merge: ccf576c 2f872b8
Author: Jay Callicott <jrcallicott@gmail.com>
Date:   Sat Jun 29 09:09:59 2013 -0500

    Merge branch '8.x' into 1898416_filter_twig

diff --cc core/modules/filter/filter.module
index 5e3ead9,251cead..cc98109
--- a/core/modules/filter/filter.module
+++ b/core/modules/filter/filter.module
@@@ -87,8 -85,19 +87,17 @@@ function filter_theme() 
      ),
      'filter_guidelines' => array(
        'variables' => array('format' => NULL),
 -    ),
 -    'filter_html_image_secure_image' => array(
 -      'variables' => array('image' => NULL),
 +      'template' => 'filter-guidelines',
      ),
+     'filter_caption' => array(
+       'variables' => array(
+         'node' => NULL,
+         'tag' => NULL,
+         'caption' => NULL,
+         'align' => NULL,
+       ),
+       'template' => 'filter-caption',
+     )
    );
  }