Index: src/wp-admin/includes/template-functions.php
===================================================================
--- src/wp-admin/includes/template-functions.php	(revision 34534)
+++ src/wp-admin/includes/template-functions.php	(working copy)
@@ -821,6 +821,15 @@
 	 * @param int $max_upload_size Allowed upload size. Default 1 MB.
 	 */
 	$bytes = apply_filters( 'import_upload_size_limit', wp_max_upload_size() );
+
+	if ( function_exists( 'memory_get_usage' ) ) {
+		$current = ini_get( 'memory_limit' );
+		ini_restore( 'memory_limit' );
+		$memory_limit = ini_set( 'memory_limit',  $current );
+		$m_bytes = size_format( $memory_limit );
+		$bytes = ( -1 === $m_bytes ) ? $bytes : min( $bytes, $m_bytes );
+	}
+
 	$size = size_format( $bytes );
 	$upload_dir = wp_upload_dir();
 	if ( ! empty( $upload_dir['error'] ) ) :