Index: media-template.php
===================================================================
--- media-template.php	(revision 40515)
+++ media-template.php	(working copy)
@@ -737,7 +737,7 @@
 			<span><?php _e('Columns'); ?></span>
 			<select class="columns" name="columns"
 				data-setting="columns">
-				<?php for ( $i = 1; $i <= 9; $i++ ) : ?>
+				<?php for ( $i = 1; $i <= apply_filters( 'gallery_settings_columns_count', 9 ); $i++ ) : ?>
 					<option value="<?php echo esc_attr( $i ); ?>" <#
 						if ( <?php echo $i ?> == wp.media.galleryDefaults.columns ) { #>selected="selected"<# }
 					#>>