Index: src/site/xdoc/manual/layouts.xml.vm
===================================================================
--- src/site/xdoc/manual/layouts.xml.vm	(revision 1613738)
+++ src/site/xdoc/manual/layouts.xml.vm	(working copy)
@@ -329,6 +329,7 @@
                     SimpleDateFormat</a>.
                 </p>
                 <p>The predefined formats are
+                  <code>DEFAULT</code>,
                   <code>ABSOLUTE</code>,
                   <code>COMPACT</code>,
                   <code>DATE</code>,
@@ -345,12 +346,16 @@
                       <th>Example</th>
                     </tr>
                     <tr>
-                      <td>%d{ISO8601}</td>
+                      <td>%d{DEFAULT}</td>
                       <td>2012-11-02 14:34:02,781</td>
                     </tr>
                     <tr>
+                      <td>%d{ISO8601}</td>
+                      <td>2012-11-02T14:34:02,781</td>
+                    </tr>
+                    <tr>
                       <td>%d{ISO8601_BASIC}</td>
-                      <td>20121102 143402,781</td>
+                      <td>20121102T143402,781</td>
                     </tr>
                     <tr>
                       <td>%d{ABSOLUTE}</td>
Index: log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/DatePatternConverterTest.java
===================================================================
--- log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/DatePatternConverterTest.java	(revision 1613738)
+++ log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/DatePatternConverterTest.java	(working copy)
@@ -39,7 +39,7 @@
         StringBuilder sb = new StringBuilder();
         converter.format(event, sb);
 
-        String expected = "2011-12-30T10:56:35,987";
+        String expected = "2011-12-30 10:56:35,987";
         assertEquals(expected, sb.toString());
     }
 
@@ -71,7 +71,7 @@
         StringBuilder sb = new StringBuilder();
         converter.format(date(2001, 1, 1), sb);
 
-        String expected = "2001-02-01T14:15:16,123";
+        String expected = "2001-02-01 14:15:16,123";
         assertEquals(expected, sb.toString());
     }
 
@@ -81,7 +81,7 @@
         StringBuilder sb = new StringBuilder();
         converter.format(sb, date(2001, 1, 1), date(2002, 2, 2), date(2003, 3, 3));
 
-        String expected = "2001-02-01T14:15:16,123"; // only process first date
+        String expected = "2001-02-01 14:15:16,123"; // only process first date
         assertEquals(expected, sb.toString());
     }
 
@@ -93,8 +93,8 @@
     }
 
     @Test
-    public void testGetPatternReturnsISO8601ByDefault() {
-        assertEquals(DatePatternConverter.ISO8601_PATTERN, DatePatternConverter.newInstance(null).getPattern());
+    public void testGetPatternReturnsCorrectDefault() {
+        assertEquals(DatePatternConverter.DEFAULT_PATTERN, DatePatternConverter.newInstance(null).getPattern());
     }
 
 }
Index: log4j-core/src/test/resources/log4j2-perf2.xml
===================================================================
--- log4j-core/src/test/resources/log4j2-perf2.xml	(revision 1613738)
+++ log4j-core/src/test/resources/log4j2-perf2.xml	(working copy)
@@ -20,7 +20,7 @@
   <Appenders>
     <File name="TestLogfile" fileName="target/testlog4j2.log" immediateFlush="false">
       <PatternLayout>
-        <Pattern>%d{ISO8601} %5p [%t] %c{1} %X{transactionId} - %m%n</Pattern>
+        <Pattern>%d %5p [%t] %c{1} %X{transactionId} - %m%n</Pattern>
       </PatternLayout>
     </File>
   </Appenders>
@@ -29,4 +29,4 @@
       <AppenderRef ref="TestLogfile"/>
     </Root>
   </Loggers>
-</Configuration>
\ No newline at end of file
+</Configuration>
Index: log4j-core/src/test/resources/log4j2-console-style-ansi.xml
===================================================================
--- log4j-core/src/test/resources/log4j2-console-style-ansi.xml	(revision 1613738)
+++ log4j-core/src/test/resources/log4j2-console-style-ansi.xml	(working copy)
@@ -19,7 +19,7 @@
 <Configuration status="OFF">
   <Appenders>
     <Console name="Console" target="SYSTEM_OUT">
-      <PatternLayout pattern="%style{%d{ISO8601}}{black} %style{[%t]}{blue} %style{%-5level:}{yellow} %style{%msg%n%throwable}{green}" />
+      <PatternLayout pattern="%style{%d}{black} %style{[%t]}{blue} %style{%-5level:}{yellow} %style{%msg%n%throwable}{green}" />
     </Console>
   </Appenders>
   <Loggers>
@@ -28,4 +28,4 @@
       <AppenderRef ref="Console" />
     </Root>
   </Loggers>
-</Configuration>
\ No newline at end of file
+</Configuration>
Index: log4j-core/src/test/resources/log4j2-console-highlight-logback.xml
===================================================================
--- log4j-core/src/test/resources/log4j2-console-highlight-logback.xml	(revision 1613738)
+++ log4j-core/src/test/resources/log4j2-console-highlight-logback.xml	(working copy)
@@ -19,7 +19,7 @@
 <Configuration status="OFF">
   <Appenders>
     <Console name="Console" target="SYSTEM_OUT">
-      <PatternLayout pattern="%highlight{%d{ISO8601} [%t] %-5level: %msg%n%throwable}{style=Logback}" />
+      <PatternLayout pattern="%highlight{%d [%t] %-5level: %msg%n%throwable}{style=Logback}" />
     </Console>
   </Appenders>
   <Loggers>
@@ -28,4 +28,4 @@
       <AppenderRef ref="Console" />
     </Root>
   </Loggers>
-</Configuration>
\ No newline at end of file
+</Configuration>
Index: log4j-core/src/test/resources/log4j2-perf-filter.xml
===================================================================
--- log4j-core/src/test/resources/log4j2-perf-filter.xml	(revision 1613738)
+++ log4j-core/src/test/resources/log4j2-perf-filter.xml	(working copy)
@@ -24,7 +24,7 @@
   <Appenders>
     <File name="TestLogfile" fileName="target/testlog4j2.log" immediateFlush="false">
       <PatternLayout>
-        <Pattern>%d{ISO8601} %5p [%t] %c{1} %X{transactionId} - %m%n</Pattern>
+        <Pattern>%d %5p [%t] %c{1} %X{transactionId} - %m%n</Pattern>
       </PatternLayout>
     </File>
   </Appenders>
@@ -33,4 +33,4 @@
       <AppenderRef ref="TestLogfile"/>
     </Root>
   </Loggers>
-</Configuration>
\ No newline at end of file
+</Configuration>
Index: log4j-core/src/test/resources/log4j2-console-highlight-default.xml
===================================================================
--- log4j-core/src/test/resources/log4j2-console-highlight-default.xml	(revision 1613738)
+++ log4j-core/src/test/resources/log4j2-console-highlight-default.xml	(working copy)
@@ -19,7 +19,7 @@
 <Configuration status="OFF">
   <Appenders>
     <Console name="Console" target="SYSTEM_OUT">
-      <PatternLayout pattern="%highlight{%d{ISO8601} [%t] %-5level: %msg%n%throwable}" />
+      <PatternLayout pattern="%highlight{%d [%t] %-5level: %msg%n%throwable}" />
     </Console>
   </Appenders>
   <Loggers>
@@ -28,4 +28,4 @@
       <AppenderRef ref="Console" />
     </Root>
   </Loggers>
-</Configuration>
\ No newline at end of file
+</Configuration>
Index: log4j-core/src/test/resources/log4j2-console-style-name-ansi.xml
===================================================================
--- log4j-core/src/test/resources/log4j2-console-style-name-ansi.xml	(revision 1613738)
+++ log4j-core/src/test/resources/log4j2-console-style-name-ansi.xml	(working copy)
@@ -19,7 +19,7 @@
 <Configuration status="OFF">
   <Appenders>
     <Console name="Console" target="SYSTEM_OUT">
-      <PatternLayout pattern="%red{%d{ISO8601}} %yellow{[%t]} %black{black} %blue{blue} %cyan{cyan} %magenta{magenta} %white{white} %green{%-5level:} %red{%msg%n%throwable}" />
+      <PatternLayout pattern="%red{%d} %yellow{[%t]} %black{black} %blue{blue} %cyan{cyan} %magenta{magenta} %white{white} %green{%-5level:} %red{%msg%n%throwable}" />
     </Console>
   </Appenders>
   <Loggers>
@@ -28,4 +28,4 @@
       <AppenderRef ref="Console" />
     </Root>
   </Loggers>
-</Configuration>
\ No newline at end of file
+</Configuration>
Index: log4j-core/src/test/resources/logback-perf-filter.xml
===================================================================
--- log4j-core/src/test/resources/logback-perf-filter.xml	(revision 1613738)
+++ log4j-core/src/test/resources/logback-perf-filter.xml	(working copy)
@@ -26,11 +26,11 @@
  <appender name="TestLogfile" class="ch.qos.logback.core.FileAppender">
    <file>target/testlogback.log</file>
    <encoder>
-     <Pattern>%d{ISO8601} %5p [%t] %c{0} %X{transactionId} - %m%n</Pattern>
+     <Pattern>%d %5p [%t] %c{0} %X{transactionId} - %m%n</Pattern>
    </encoder>
  </appender>
 
  <root level="error">
    <appender-ref ref="TestLogfile" />
  </root>
-</configuration>
\ No newline at end of file
+</configuration>
Index: log4j-core/src/test/resources/log4j2-perf.xml
===================================================================
--- log4j-core/src/test/resources/log4j2-perf.xml	(revision 1613738)
+++ log4j-core/src/test/resources/log4j2-perf.xml	(working copy)
@@ -20,7 +20,7 @@
   <Appenders>
     <File name="TestLogfile" fileName="target/testlog4j2.log" immediateFlush="false">
       <PatternLayout>
-        <Pattern>%d{ISO8601} %5p [%t] %c{1} %X{transactionId} - %m%n</Pattern>
+        <Pattern>%d %5p [%t] %c{1} %X{transactionId} - %m%n</Pattern>
       </PatternLayout>
     </File>
   </Appenders>
@@ -29,4 +29,4 @@
       <AppenderRef ref="TestLogfile"/>
     </Root>
   </Loggers>
-</Configuration>
\ No newline at end of file
+</Configuration>
Index: log4j-core/src/test/resources/log4j2-console-style-no-ansi.xml
===================================================================
--- log4j-core/src/test/resources/log4j2-console-style-no-ansi.xml	(revision 1613738)
+++ log4j-core/src/test/resources/log4j2-console-style-no-ansi.xml	(working copy)
@@ -20,7 +20,7 @@
   <Appenders>
     <Console name="Console" target="SYSTEM_OUT">
       <PatternLayout noConsoleNoAnsi="true"
-        pattern="%style{%d{ISO8601}}{black} %style{[%t]}{blue} %style{%-5level:}{yellow} %style{%msg%n%throwable}{green}" />
+        pattern="%style{%d}{black} %style{[%t]}{blue} %style{%-5level:}{yellow} %style{%msg%n%throwable}{green}" />
     </Console>
   </Appenders>
   <Loggers>
Index: log4j-core/src/test/resources/logback-perf2.xml
===================================================================
--- log4j-core/src/test/resources/logback-perf2.xml	(revision 1613738)
+++ log4j-core/src/test/resources/logback-perf2.xml	(working copy)
@@ -19,11 +19,11 @@
  <appender name="TestLogfile" class="ch.qos.logback.core.FileAppender">
    <file>target/testlogback.log</file>
    <encoder>
-     <Pattern>%d{ISO8601} %5p [%t] %c{0} %X{transactionId} - %m%n</Pattern>
+     <Pattern>%d %5p [%t] %c{0} %X{transactionId} - %m%n</Pattern>
    </encoder>
  </appender>
 
  <root level="error">
    <appender-ref ref="TestLogfile" />
  </root>
-</configuration>
\ No newline at end of file
+</configuration>
Index: log4j-core/src/test/resources/log4j2-console-highlight.xml
===================================================================
--- log4j-core/src/test/resources/log4j2-console-highlight.xml	(revision 1613738)
+++ log4j-core/src/test/resources/log4j2-console-highlight.xml	(working copy)
@@ -19,7 +19,7 @@
 <Configuration status="OFF">
   <Appenders>
     <Console name="Console" target="SYSTEM_OUT">
-      <PatternLayout pattern="%highlight{%d{ISO8601} [%t] %-5level: %msg%n%throwable}{FATAL=white, ERROR=red, WARN=blue, INFO=black, DEBUG=green, TRACE=blue}" />
+      <PatternLayout pattern="%highlight{%d [%t] %-5level: %msg%n%throwable}{FATAL=white, ERROR=red, WARN=blue, INFO=black, DEBUG=green, TRACE=blue}" />
     </Console>
   </Appenders>
   <Loggers>
@@ -28,4 +28,4 @@
       <AppenderRef ref="Console" />
     </Root>
   </Loggers>
-</Configuration>
\ No newline at end of file
+</Configuration>
Index: log4j-core/src/test/resources/logback-perf.xml
===================================================================
--- log4j-core/src/test/resources/logback-perf.xml	(revision 1613738)
+++ log4j-core/src/test/resources/logback-perf.xml	(working copy)
@@ -20,11 +20,11 @@
    <file>target/testlogback.log</file>
    <encoder>
      <immediateFlush>false</immediateFlush>
-     <Pattern>%d{ISO8601} %5p [%t] %c{0} %X{transactionId} - %m%n</Pattern>
+     <Pattern>%d %5p [%t] %c{0} %X{transactionId} - %m%n</Pattern>
    </encoder>
  </appender>
 
  <root level="debug">
    <appender-ref ref="TestLogfile" />
  </root>
-</configuration>
\ No newline at end of file
+</configuration>
Index: log4j-core/src/test/resources/log4j12-perf2.xml
===================================================================
--- log4j-core/src/test/resources/log4j12-perf2.xml	(revision 1613738)
+++ log4j-core/src/test/resources/log4j12-perf2.xml	(working copy)
@@ -21,11 +21,11 @@
    <param name="File" value="target/testlog4j.log"/>
    <param name="immediateFlush" value="false"/>
    <layout class="org.apache.log4j.PatternLayout">
-     <param name="ConversionPattern" value="%d{ISO8601} %5p [%t] %c{1} %X{transactionId} - %m%n"/>
+     <param name="ConversionPattern" value="%d %5p [%t] %c{1} %X{transactionId} - %m%n"/>
    </layout>
  </appender>
  <root>
    <level value="error"/>
    <appender-ref ref="TestLogfile"/>
  </root>
-</log4j:configuration>
\ No newline at end of file
+</log4j:configuration>
Index: log4j-core/src/test/resources/log4j2-console.xml
===================================================================
--- log4j-core/src/test/resources/log4j2-console.xml	(revision 1613738)
+++ log4j-core/src/test/resources/log4j2-console.xml	(working copy)
@@ -19,7 +19,7 @@
 <Configuration status="OFF">
   <Appenders>
     <Console name="Console" target="SYSTEM_OUT">
-      <PatternLayout pattern="%d{ISO8601} [%t] %-5level: %msg%n%throwable" />
+      <PatternLayout pattern="%d [%t] %-5level: %msg%n%throwable" />
     </Console>
   </Appenders>
   <Loggers>
@@ -28,4 +28,4 @@
       <AppenderRef ref="Console" />
     </Root>
   </Loggers>
-</Configuration>
\ No newline at end of file
+</Configuration>
Index: log4j-core/src/test/resources/AsyncLoggerTimestampMessageTest.xml
===================================================================
--- log4j-core/src/test/resources/AsyncLoggerTimestampMessageTest.xml	(revision 0)
+++ log4j-core/src/test/resources/AsyncLoggerTimestampMessageTest.xml	(revision 0)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Configuration status="ERROR">
+  <Appenders>
+    <RandomAccessFile name="RandomAccessFile" fileName="target/AsyncLoggerTimestampMessageTest.log"
+	    		immediateFlush="false" append="false">
+      <PatternLayout>
+        <Pattern>%d{UNIX_MILLIS} %m%n</Pattern>
+      </PatternLayout>
+    </RandomAccessFile>
+  </Appenders>
+  
+  <Loggers>
+    <Root level="info" includeLocation="false">
+      <AppenderRef ref="RandomAccessFile"/>
+    </Root>
+  </Loggers>
+</Configuration>
\ No newline at end of file
Index: log4j-core/src/test/resources/log4j2-319.xml
===================================================================
--- log4j-core/src/test/resources/log4j2-319.xml	(revision 1613738)
+++ log4j-core/src/test/resources/log4j2-319.xml	(working copy)
@@ -20,7 +20,7 @@
 <Configuration status="OFF">
   <Appenders>
     <Console name="Console" target="SYSTEM_OUT">
-      <PatternLayout pattern="%d{ISO8601} %highlight{[%t] %-5level: %msg%n%throwable}" />
+      <PatternLayout pattern="%d %highlight{[%t] %-5level: %msg%n%throwable}" />
     </Console>
   </Appenders>
   <Loggers>
@@ -29,4 +29,4 @@
       <AppenderRef ref="Console" />
     </Root>
   </Loggers>
-</Configuration>
\ No newline at end of file
+</Configuration>
Index: log4j-core/src/test/resources/log4j12-perf.xml
===================================================================
--- log4j-core/src/test/resources/log4j12-perf.xml	(revision 1613738)
+++ log4j-core/src/test/resources/log4j12-perf.xml	(working copy)
@@ -21,11 +21,11 @@
    <param name="File" value="target/testlog4j.log"/>
    <param name="immediateFlush" value="false"/>
    <layout class="org.apache.log4j.PatternLayout">
-     <param name="ConversionPattern" value="%d{ISO8601} %5p [%t] %c{1} %X{transactionId} - %m%n"/>
+     <param name="ConversionPattern" value="%d %5p [%t] %c{1} %X{transactionId} - %m%n"/>
    </layout>
  </appender>
  <root>
    <level value="debug"/>
    <appender-ref ref="TestLogfile"/>
  </root>
-</log4j:configuration>
\ No newline at end of file
+</log4j:configuration>
Index: log4j-core/src/test/resources/logback-subst.xml
===================================================================
--- log4j-core/src/test/resources/logback-subst.xml	(revision 1613738)
+++ log4j-core/src/test/resources/logback-subst.xml	(working copy)
@@ -18,11 +18,11 @@
 <configuration>
  <appender name="stdout" class="ch.qos.logback.core.ConsoleAppender">
    <encoder>
-     <Pattern>%d{ISO8601} %5p [%t] %c{0} - %m%n</Pattern>
+     <Pattern>%d %5p [%t] %c{0} - %m%n</Pattern>
    </encoder>
  </appender>
 
  <root level="debug">
    <appender-ref ref="stdout" />
  </root>
-</configuration>
\ No newline at end of file
+</configuration>
Index: log4j-core/src/test/resources/logback-flume.xml
===================================================================
--- log4j-core/src/test/resources/logback-flume.xml	(revision 1613738)
+++ log4j-core/src/test/resources/logback-flume.xml	(working copy)
@@ -18,11 +18,11 @@
 <configuration>
  <appender name="Console" class="ch.qos.logback.core.ConsoleAppender">
    <encoder>
-     <Pattern>%d{ISO8601} %5p [%t] %c{0} %X{transactionId} - %m%n</Pattern>
+     <Pattern>%d %5p [%t] %c{0} %X{transactionId} - %m%n</Pattern>
    </encoder>
  </appender>
 
  <root level="error">
    <appender-ref ref="Console" />
  </root>
-</configuration>
\ No newline at end of file
+</configuration>
Index: log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/DatePatternConverter.java
===================================================================
--- log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/DatePatternConverter.java	(revision 1613738)
+++ log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/DatePatternConverter.java	(working copy)
@@ -105,6 +105,16 @@
     private static final String DATE_AND_TIME_PATTERN = "dd MMM yyyy HH:mm:ss,SSS";
 
     /**
+     * DEFAULT string literal.
+     */
+    private static final String DEFAULT_FORMAT = "DEFAULT";
+
+    /**
+     * SimpleTimePattern for DEFAULT.
+     */
+    static final String DEFAULT_PATTERN = "yyyy-MM-dd HH:mm:ss,SSS";
+
+    /**
      * ISO8601_BASIC string literal.
      */
     private static final String ISO8601_BASIC_FORMAT = "ISO8601_BASIC";
@@ -169,7 +179,9 @@
         String pattern = null;
         Formatter tempFormatter = null;
 
-        if (patternOption == null || patternOption.equalsIgnoreCase(ISO8601_FORMAT)) {
+        if (patternOption == null || patternOption.equalsIgnoreCase(DEFAULT_FORMAT)) {
+            pattern = DEFAULT_PATTERN;
+        } else if (patternOption.equalsIgnoreCase(ISO8601_FORMAT)) {
             pattern = ISO8601_PATTERN;
         } else if (patternOption.equalsIgnoreCase(ISO8601_BASIC_FORMAT)) {
             pattern = ISO8601_BASIC_PATTERN;
@@ -195,8 +207,8 @@
             } catch (final IllegalArgumentException e) {
                 LOGGER.warn("Could not instantiate SimpleDateFormat with pattern " + patternOption, e);
 
-                // default to the ISO8601 format
-                tempFormat = new SimpleDateFormat(ISO8601_PATTERN);
+                // default to the DEFAULT format
+                tempFormat = new SimpleDateFormat(DEFAULT_PATTERN);
             }
 
             // if the option list contains a TZ option, then set it.