Index: src/wp-includes/formatting.php
===================================================================
--- src/wp-includes/formatting.php	(revision 29725)
+++ src/wp-includes/formatting.php	(working copy)
@@ -476,7 +476,16 @@
 		return $pee;
 	}
 
-	$tagregexp = join( '|', array_map( 'preg_quote', array_keys( $shortcode_tags ) ) );
+	/**
+	 * Filter the list of shortcodes to run through the 'unautop' routine.
+	 *
+	 * @since 4.1.0
+	 *
+	 * @param array $shortcode_tags Shortcode tags to run through the 'unautop' routine.
+	 */
+	$shortcode_tags = apply_filters( 'unautop_shortcodes', $shortcode_tags );
+
+	$tagregexp = join( '|', array_map( 'preg_quote', $shortcode_tags ) );
 	$spaces = wp_spaces_regexp();
 
 	$pattern =