diff --git wp-admin/includes/media.php wp-admin/includes/media.php
index 5e9912b..f45ac61 100644
--- wp-admin/includes/media.php
+++ wp-admin/includes/media.php
@@ -445,7 +445,7 @@ function media_upload_form_handler() {
 
 	if ( !empty($_POST['attachments']) ) foreach ( $_POST['attachments'] as $attachment_id => $attachment ) {
 		$attachment = wp_unslash( $attachment );
-	
+
 		$post = $_post = get_post($attachment_id, ARRAY_A);
 		$post_type_object = get_post_type_object( $post[ 'post_type' ] );
 
diff --git wp-includes/media-template.php wp-includes/media-template.php
index 7e79efd..61f1ee3 100644
--- wp-includes/media-template.php
+++ wp-includes/media-template.php
@@ -353,6 +353,9 @@ function wp_print_media_templates() {
 				<option value="post">
 					<?php esc_attr_e('Attachment Page'); ?>
 				</option>
+				<option value="none">
+					<?php esc_attr_e('None'); ?>
+				</option>
 			</select>
 		</label>
 
diff --git wp-includes/media.php wp-includes/media.php
index 2b770ce..db07c95 100644
--- wp-includes/media.php
+++ wp-includes/media.php
@@ -763,9 +763,6 @@ function gallery_shortcode($attr) {
 				text-align: center;
 				width: {$itemwidth}%;
 			}
-			#{$selector} img {
-				border: 2px solid #cfcfcf;
-			}
 			#{$selector} .gallery-caption {
 				margin-left: 0;
 			}
@@ -777,12 +774,27 @@ function gallery_shortcode($attr) {
 
 	$i = 0;
 	foreach ( $attachments as $id => $attachment ) {
-		$link = isset($attr['link']) && 'file' == $attr['link'] ? wp_get_attachment_link($id, $size, false, false) : wp_get_attachment_link($id, $size, true, false);
+		/*
+		* Output image link. By default, image links to
+		* attachment page. If link="file" is passed to
+		* the shortcode, the image links directly to
+		* the file.
+		*/
+		$image_link = isset( $attr['link'] ) && 'file' == $attr['link'] ? wp_get_attachment_link( $id, $size, false, false ) : wp_get_attachment_link( $id, $size, true, false );
+		/*
+		* Output flat image. By default, image links to
+		* attachment page. If link="none" is passed to
+		* the shortcode, a flat (unlinked) image is
+		* output.
+		 */
+		$flat_image = ( isset( $attr['link'] ) && 'none' == $attr['link'] ? wp_get_attachment_image( $id, $size, false ) : false );
+		// Determine whether to output a linked or flat image
+		$image_output = ( $flat_image ? $flat_image : $image_link );
 
 		$output .= "<{$itemtag} class='gallery-item'>";
 		$output .= "
 			<{$icontag} class='gallery-icon'>
-				$link
+				$image_output
 			</{$icontag}>";
 		if ( $captiontag && trim($attachment->post_excerpt) ) {
 			$output .= "