From 2c50ccb764bb67fcaaed641289e9e4c3649f0f91 Mon Sep 17 00:00:00 2001
From: OGINO Masanori <masanori.ogino@gmail.com>
Date: Tue, 10 Jun 2014 09:47:14 +0900
Subject: [PATCH] Add timezone to datetime objects. Refs #962.

Based on https://github.com/getpelican/pelican/pull/977, but it adds
timezone information before formatting.

Signed-off-by: OGINO Masanori <masanori.ogino@gmail.com>
---
 pelican/contents.py                           |  9 ++++++-
 .../basic/a-markdown-powered-article.html     |  4 ++--
 pelican/tests/output/basic/archives.html      |  2 +-
 pelican/tests/output/basic/article-1.html     |  4 ++--
 pelican/tests/output/basic/article-2.html     |  4 ++--
 pelican/tests/output/basic/article-3.html     |  4 ++--
 .../output/basic/author/alexis-metaireau.html |  8 +++----
 pelican/tests/output/basic/categories.html    |  2 +-
 pelican/tests/output/basic/category/bar.html  |  2 +-
 pelican/tests/output/basic/category/cat1.html | 10 ++++----
 pelican/tests/output/basic/category/misc.html | 10 ++++----
 pelican/tests/output/basic/category/yeah.html |  4 ++--
 .../basic/feeds/alexis-metaireau.atom.xml     |  6 ++---
 .../basic/feeds/alexis-metaireau.rss.xml      |  6 ++---
 .../tests/output/basic/feeds/all-en.atom.xml  | 22 ++++++++---------
 .../tests/output/basic/feeds/all-fr.atom.xml  |  4 ++--
 pelican/tests/output/basic/feeds/all.atom.xml | 24 +++++++++----------
 pelican/tests/output/basic/feeds/bar.atom.xml |  4 ++--
 .../tests/output/basic/feeds/cat1.atom.xml    | 10 ++++----
 .../tests/output/basic/feeds/misc.atom.xml    | 10 ++++----
 .../tests/output/basic/feeds/yeah.atom.xml    |  4 ++--
 .../basic/filename_metadata-example.html      |  4 ++--
 pelican/tests/output/basic/index.html         | 24 +++++++++----------
 pelican/tests/output/basic/oh-yeah.html       |  4 ++--
 .../tests/output/basic/override/index.html    |  2 +-
 .../pages/this-is-a-test-hidden-page.html     |  2 +-
 .../basic/pages/this-is-a-test-page.html      |  2 +-
 .../tests/output/basic/second-article-fr.html |  4 ++--
 .../tests/output/basic/second-article.html    |  4 ++--
 pelican/tests/output/basic/tag/bar.html       | 10 ++++----
 pelican/tests/output/basic/tag/baz.html       |  4 ++--
 pelican/tests/output/basic/tag/foo.html       |  8 +++----
 pelican/tests/output/basic/tag/foobar.html    |  4 ++--
 pelican/tests/output/basic/tag/yeah.html      |  2 +-
 .../output/basic/this-is-a-super-article.html |  6 ++---
 pelican/tests/output/basic/unbelievable.html  |  4 ++--
 .../custom/a-markdown-powered-article.html    |  4 ++--
 pelican/tests/output/custom/article-1.html    |  4 ++--
 pelican/tests/output/custom/article-2.html    |  4 ++--
 pelican/tests/output/custom/article-3.html    |  4 ++--
 .../custom/author/alexis-metaireau.html       | 10 ++++----
 .../custom/author/alexis-metaireau2.html      | 12 +++++-----
 .../custom/author/alexis-metaireau3.html      |  4 ++--
 pelican/tests/output/custom/category/bar.html |  2 +-
 .../tests/output/custom/category/cat1.html    |  8 +++----
 .../tests/output/custom/category/misc.html    |  8 +++----
 .../tests/output/custom/category/yeah.html    |  4 ++--
 .../output/custom/drafts/a-draft-article.html |  2 +-
 .../custom/filename_metadata-example.html     |  2 +-
 pelican/tests/output/custom/index.html        |  8 +++----
 pelican/tests/output/custom/index2.html       | 12 +++++-----
 pelican/tests/output/custom/index3.html       |  4 ++--
 pelican/tests/output/custom/oh-yeah-fr.html   |  2 +-
 pelican/tests/output/custom/oh-yeah.html      |  2 +-
 .../output/custom/second-article-fr.html      |  2 +-
 .../tests/output/custom/second-article.html   |  2 +-
 pelican/tests/output/custom/tag/bar.html      | 10 ++++----
 pelican/tests/output/custom/tag/baz.html      |  2 +-
 pelican/tests/output/custom/tag/foo.html      |  8 +++----
 pelican/tests/output/custom/tag/foobar.html   |  4 ++--
 pelican/tests/output/custom/tag/yeah.html     |  2 +-
 .../custom/this-is-a-super-article.html       |  6 ++---
 pelican/tests/output/custom/unbelievable.html |  2 +-
 .../author/alexis-metaireau.html              |  8 +++----
 .../author/alexis-metaireau2.html             | 12 +++++-----
 .../author/alexis-metaireau3.html             |  4 ++--
 .../output/custom_locale/category/bar.html    |  2 +-
 .../output/custom_locale/category/cat1.html   |  8 +++----
 .../output/custom_locale/category/misc.html   |  8 +++----
 .../output/custom_locale/category/yeah.html   |  6 ++---
 .../custom_locale/drafts/a-draft-article.html |  2 +-
 pelican/tests/output/custom_locale/index.html |  8 +++----
 .../tests/output/custom_locale/index2.html    | 12 +++++-----
 .../tests/output/custom_locale/index3.html    |  4 ++--
 .../output/custom_locale/oh-yeah-fr.html      |  2 +-
 .../02/this-is-a-super-article/index.html     |  6 ++---
 .../2010/octobre/15/unbelievable/index.html   |  2 +-
 .../posts/2010/octobre/20/oh-yeah/index.html  |  2 +-
 .../20/a-markdown-powered-article/index.html  |  2 +-
 .../2011/février/17/article-1/index.html      |  2 +-
 .../2011/février/17/article-2/index.html      |  2 +-
 .../2011/février/17/article-3/index.html      |  2 +-
 .../2012/février/29/second-article/index.html |  2 +-
 .../30/filename_metadata-example/index.html   |  2 +-
 .../custom_locale/second-article-fr.html      |  2 +-
 .../tests/output/custom_locale/tag/bar.html   | 10 ++++----
 .../tests/output/custom_locale/tag/baz.html   |  2 +-
 .../tests/output/custom_locale/tag/foo.html   |  8 +++----
 .../output/custom_locale/tag/foobar.html      |  6 ++---
 .../tests/output/custom_locale/tag/yeah.html  |  2 +-
 pelican/tests/test_utils.py                   |  3 +++
 pelican/utils.py                              |  4 +++-
 92 files changed, 259 insertions(+), 247 deletions(-)

diff --git a/pelican/contents.py b/pelican/contents.py
index 297a537b..7a9a8bc0 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -16,7 +16,7 @@ from pelican import signals
 from pelican.settings import DEFAULT_CONFIG
 from pelican.utils import (slugify, truncate_html_words, memoized, strftime,
                            python_2_unicode_compatible, deprecated_attribute,
-                           path_to_url, SafeDatetime)
+                           path_to_url, set_date_tzinfo, SafeDatetime)
 
 # Import these so that they're avalaible when you import from pelican.contents.
 from pelican.urlwrappers import (URLWrapper, Author, Category, Tag)  # NOQA
@@ -117,9 +117,16 @@ class Content(object):
             locale.setlocale(locale.LC_ALL, locale_string)
             self.date_format = self.date_format[1]
 
+        # manage timezone
+        default_timezone = settings.get('TIMEZONE', 'UTC')
+        timezone = getattr(self, 'timezone', default_timezone)
+
         if hasattr(self, 'date'):
+            self.date = set_date_tzinfo(self.date, timezone)
             self.locale_date = strftime(self.date, self.date_format)
+
         if hasattr(self, 'modified'):
+            self.modified = set_date_tzinfo(self.modified, timezone)
             self.locale_modified = strftime(self.modified, self.date_format)
 
         # manage status
diff --git a/pelican/tests/output/basic/a-markdown-powered-article.html b/pelican/tests/output/basic/a-markdown-powered-article.html
index 40c96766..5fcc42a9 100644
--- a/pelican/tests/output/basic/a-markdown-powered-article.html
+++ b/pelican/tests/output/basic/a-markdown-powered-article.html
@@ -34,7 +34,7 @@
 
     <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2011-04-20T00:00:00">
+        <abbr class="published" title="2011-04-20T00:00:00+00:00">
                 Published: Wed 20 April 2011
         </abbr>
 
@@ -66,4 +66,4 @@
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/basic/archives.html b/pelican/tests/output/basic/archives.html
index e32c92ba..f8f1a67f 100644
--- a/pelican/tests/output/basic/archives.html
+++ b/pelican/tests/output/basic/archives.html
@@ -69,4 +69,4 @@
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/basic/article-1.html b/pelican/tests/output/basic/article-1.html
index 15a1496d..4ea7f4e3 100644
--- a/pelican/tests/output/basic/article-1.html
+++ b/pelican/tests/output/basic/article-1.html
@@ -34,7 +34,7 @@
 
     <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2011-02-17T00:00:00">
+        <abbr class="published" title="2011-02-17T00:00:00+00:00">
                 Published: Thu 17 February 2011
         </abbr>
 
@@ -65,4 +65,4 @@
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/basic/article-2.html b/pelican/tests/output/basic/article-2.html
index c4b09e35..45130e55 100644
--- a/pelican/tests/output/basic/article-2.html
+++ b/pelican/tests/output/basic/article-2.html
@@ -34,7 +34,7 @@
 
     <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2011-02-17T00:00:00">
+        <abbr class="published" title="2011-02-17T00:00:00+00:00">
                 Published: Thu 17 February 2011
         </abbr>
 
@@ -65,4 +65,4 @@
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/basic/article-3.html b/pelican/tests/output/basic/article-3.html
index 1c07e5e2..8603430f 100644
--- a/pelican/tests/output/basic/article-3.html
+++ b/pelican/tests/output/basic/article-3.html
@@ -34,7 +34,7 @@
 
     <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2011-02-17T00:00:00">
+        <abbr class="published" title="2011-02-17T00:00:00+00:00">
                 Published: Thu 17 February 2011
         </abbr>
 
@@ -65,4 +65,4 @@
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/basic/author/alexis-metaireau.html b/pelican/tests/output/basic/author/alexis-metaireau.html
index d1dc6da6..11d54185 100644
--- a/pelican/tests/output/basic/author/alexis-metaireau.html
+++ b/pelican/tests/output/basic/author/alexis-metaireau.html
@@ -29,11 +29,11 @@
                 <article>
                     <h1 class="entry-title"><a href="/this-is-a-super-article.html">This is a super article !</a></h1>
 <footer class="post-info">
-        <abbr class="published" title="2010-12-02T10:14:00">
+        <abbr class="published" title="2010-12-02T10:14:00+00:00">
                 Published: Thu 02 December 2010
         </abbr>
 		<br />
-        <abbr class="modified" title="2013-11-17T23:29:00">
+        <abbr class="modified" title="2013-11-17T23:29:00+00:00">
                 Updated: Sun 17 November 2013
         </abbr>
 
@@ -69,7 +69,7 @@
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2010-10-20T10:14:00">
+        <abbr class="published" title="2010-10-20T10:14:00+00:00">
                 Published: Wed 20 October 2010
         </abbr>
 
@@ -109,4 +109,4 @@ YEAH !</p>
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/basic/categories.html b/pelican/tests/output/basic/categories.html
index fa2fc012..55e955c8 100644
--- a/pelican/tests/output/basic/categories.html
+++ b/pelican/tests/output/basic/categories.html
@@ -49,4 +49,4 @@
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/basic/category/bar.html b/pelican/tests/output/basic/category/bar.html
index 763cfe77..18e434cb 100644
--- a/pelican/tests/output/basic/category/bar.html
+++ b/pelican/tests/output/basic/category/bar.html
@@ -29,7 +29,7 @@
                 <article>
                     <h1 class="entry-title"><a href="/oh-yeah.html">Oh yeah !</a></h1>
 <footer class="post-info">
-        <abbr class="published" title="2010-10-20T10:14:00">
+        <abbr class="published" title="2010-10-20T10:14:00+00:00">
                 Published: Wed 20 October 2010
         </abbr>
 
diff --git a/pelican/tests/output/basic/category/cat1.html b/pelican/tests/output/basic/category/cat1.html
index b1e34e3e..f99eb497 100644
--- a/pelican/tests/output/basic/category/cat1.html
+++ b/pelican/tests/output/basic/category/cat1.html
@@ -29,7 +29,7 @@
                 <article>
                     <h1 class="entry-title"><a href="/a-markdown-powered-article.html">A markdown powered article</a></h1>
 <footer class="post-info">
-        <abbr class="published" title="2011-04-20T00:00:00">
+        <abbr class="published" title="2011-04-20T00:00:00+00:00">
                 Published: Wed 20 April 2011
         </abbr>
 
@@ -52,7 +52,7 @@
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2011-02-17T00:00:00">
+        <abbr class="published" title="2011-02-17T00:00:00+00:00">
                 Published: Thu 17 February 2011
         </abbr>
 
@@ -72,7 +72,7 @@
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2011-02-17T00:00:00">
+        <abbr class="published" title="2011-02-17T00:00:00+00:00">
                 Published: Thu 17 February 2011
         </abbr>
 
@@ -92,7 +92,7 @@
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2011-02-17T00:00:00">
+        <abbr class="published" title="2011-02-17T00:00:00+00:00">
                 Published: Thu 17 February 2011
         </abbr>
 
@@ -124,4 +124,4 @@
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/basic/category/misc.html b/pelican/tests/output/basic/category/misc.html
index d53b1f31..fc724edb 100644
--- a/pelican/tests/output/basic/category/misc.html
+++ b/pelican/tests/output/basic/category/misc.html
@@ -29,7 +29,7 @@
                 <article>
                     <h1 class="entry-title"><a href="/filename_metadata-example.html">FILENAME_METADATA example</a></h1>
 <footer class="post-info">
-        <abbr class="published" title="2012-11-30T00:00:00">
+        <abbr class="published" title="2012-11-30T00:00:00+00:00">
                 Published: Fri 30 November 2012
         </abbr>
 
@@ -51,7 +51,7 @@
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2012-02-29T00:00:00">
+        <abbr class="published" title="2012-02-29T00:00:00+00:00">
                 Published: Wed 29 February 2012
         </abbr>
 
@@ -73,7 +73,7 @@
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2010-10-15T20:30:00">
+        <abbr class="published" title="2010-10-15T20:30:00+00:00">
                 Published: Fri 15 October 2010
         </abbr>
 
@@ -103,7 +103,7 @@ pelican.conf, it ...</p></div>
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2010-03-14T00:00:00">
+        <abbr class="published" title="2010-03-14T00:00:00+00:00">
                 Published: Sun 14 March 2010
         </abbr>
 
@@ -135,4 +135,4 @@ pelican.conf, it ...</p></div>
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/basic/category/yeah.html b/pelican/tests/output/basic/category/yeah.html
index 225eae6e..7fe75a86 100644
--- a/pelican/tests/output/basic/category/yeah.html
+++ b/pelican/tests/output/basic/category/yeah.html
@@ -29,11 +29,11 @@
                 <article>
                     <h1 class="entry-title"><a href="/this-is-a-super-article.html">This is a super article !</a></h1>
 <footer class="post-info">
-        <abbr class="published" title="2010-12-02T10:14:00">
+        <abbr class="published" title="2010-12-02T10:14:00+00:00">
                 Published: Thu 02 December 2010
         </abbr>
 		<br />
-        <abbr class="modified" title="2013-11-17T23:29:00">
+        <abbr class="modified" title="2013-11-17T23:29:00+00:00">
                 Updated: Sun 17 November 2013
         </abbr>
 
diff --git a/pelican/tests/output/basic/feeds/alexis-metaireau.atom.xml b/pelican/tests/output/basic/feeds/alexis-metaireau.atom.xml
index d87023b5..f9a2e6e1 100644
--- a/pelican/tests/output/basic/feeds/alexis-metaireau.atom.xml
+++ b/pelican/tests/output/basic/feeds/alexis-metaireau.atom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/alexis-metaireau.atom.xml" rel="self"></link><id>/</id><updated>2013-11-17T23:29:00Z</updated><entry><title>This is a super article !</title><link href="/this-is-a-super-article.html" rel="alternate"></link><updated>2013-11-17T23:29:00Z</updated><author><name>Alexis Métaireau</name></author><id>tag:,2010-12-02:this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/alexis-metaireau.atom.xml" rel="self"></link><id>/</id><updated>2013-11-17T23:29:00+00:00</updated><entry><title>This is a super article !</title><link href="/this-is-a-super-article.html" rel="alternate"></link><updated>2013-11-17T23:29:00+00:00</updated><author><name>Alexis Métaireau</name></author><id>tag:,2010-12-02:this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
@@ -11,10 +11,10 @@
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="/oh-yeah.html" rel="alternate"></link><updated>2010-10-20T10:14:00Z</updated><author><name>Alexis Métaireau</name></author><id>tag:,2010-10-20:oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="/oh-yeah.html" rel="alternate"></link><updated>2010-10-20T10:14:00+00:00</updated><author><name>Alexis Métaireau</name></author><id>tag:,2010-10-20:oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="|filename|/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry></feed>
\ No newline at end of file
+</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry></feed>
diff --git a/pelican/tests/output/basic/feeds/alexis-metaireau.rss.xml b/pelican/tests/output/basic/feeds/alexis-metaireau.rss.xml
index 09409217..511ffa0e 100644
--- a/pelican/tests/output/basic/feeds/alexis-metaireau.rss.xml
+++ b/pelican/tests/output/basic/feeds/alexis-metaireau.rss.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"><channel><title>A Pelican Blog</title><link>/</link><description></description><atom:link href="/feeds/alexis-metaireau.rss.xml" rel="self"></atom:link><lastBuildDate>Sun, 17 Nov 2013 23:29:00 -0000</lastBuildDate><item><title>This is a super article !</title><link>/this-is-a-super-article.html</link><description>&lt;p&gt;Some content here !&lt;/p&gt;
+<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"><channel><title>A Pelican Blog</title><link>/</link><description></description><atom:link href="/feeds/alexis-metaireau.rss.xml" rel="self"></atom:link><lastBuildDate>Sun, 17 Nov 2013 23:29:00 +0000</lastBuildDate><item><title>This is a super article !</title><link>/this-is-a-super-article.html</link><description>&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
@@ -11,10 +11,10 @@
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 17 Nov 2013 23:29:00 -0000</pubDate><guid>tag:,2010-12-02:this-is-a-super-article.html</guid><category>foo</category><category>bar</category><category>foobar</category></item><item><title>Oh yeah !</title><link>/oh-yeah.html</link><description>&lt;div class="section" id="why-not"&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 17 Nov 2013 23:29:00 +0000</pubDate><guid>tag:,2010-12-02:this-is-a-super-article.html</guid><category>foo</category><category>bar</category><category>foobar</category></item><item><title>Oh yeah !</title><link>/oh-yeah.html</link><description>&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="|filename|/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 -0000</pubDate><guid>tag:,2010-10-20:oh-yeah.html</guid><category>oh</category><category>bar</category><category>yeah</category></item></channel></rss>
\ No newline at end of file
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0000</pubDate><guid>tag:,2010-10-20:oh-yeah.html</guid><category>oh</category><category>bar</category><category>yeah</category></item></channel></rss>
diff --git a/pelican/tests/output/basic/feeds/all-en.atom.xml b/pelican/tests/output/basic/feeds/all-en.atom.xml
index 128e1b3b..3ce41d77 100644
--- a/pelican/tests/output/basic/feeds/all-en.atom.xml
+++ b/pelican/tests/output/basic/feeds/all-en.atom.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/all-en.atom.xml" rel="self"></link><id>/</id><updated>2013-11-17T23:29:00Z</updated><entry><title>FILENAME_METADATA example</title><link href="/filename_metadata-example.html" rel="alternate"></link><updated>2012-11-30T00:00:00Z</updated><author><name></name></author><id>tag:,2012-11-30:filename_metadata-example.html</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</summary></entry><entry><title>Second article</title><link href="/second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00Z</updated><author><name></name></author><id>tag:,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="/a-markdown-powered-article.html" rel="alternate"></link><updated>2011-04-20T00:00:00Z</updated><author><name></name></author><id>tag:,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/all-en.atom.xml" rel="self"></link><id>/</id><updated>2013-11-17T23:29:00+00:00</updated><entry><title>FILENAME_METADATA example</title><link href="/filename_metadata-example.html" rel="alternate"></link><updated>2012-11-30T00:00:00+00:00</updated><author><name></name></author><id>tag:,2012-11-30:filename_metadata-example.html</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</summary></entry><entry><title>Second article</title><link href="/second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00+00:00</updated><author><name></name></author><id>tag:,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="/a-markdown-powered-article.html" rel="alternate"></link><updated>2011-04-20T00:00:00+00:00</updated><author><name></name></author><id>tag:,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="/unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="/article-1.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name></name></author><id>tag:,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</summary></entry><entry><title>Article 2</title><link href="/article-2.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name></name></author><id>tag:,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</summary></entry><entry><title>Article 3</title><link href="/article-3.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name></name></author><id>tag:,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
-</summary></entry><entry><title>This is a super article !</title><link href="/this-is-a-super-article.html" rel="alternate"></link><updated>2013-11-17T23:29:00Z</updated><author><name>Alexis Métaireau</name></author><id>tag:,2010-12-02:this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
+&lt;a href="/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="/article-1.html" rel="alternate"></link><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</summary></entry><entry><title>Article 2</title><link href="/article-2.html" rel="alternate"></link><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</summary></entry><entry><title>Article 3</title><link href="/article-3.html" rel="alternate"></link><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
+</summary></entry><entry><title>This is a super article !</title><link href="/this-is-a-super-article.html" rel="alternate"></link><updated>2013-11-17T23:29:00+00:00</updated><author><name>Alexis Métaireau</name></author><id>tag:,2010-12-02:this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
@@ -18,13 +18,13 @@
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="/oh-yeah.html" rel="alternate"></link><updated>2010-10-20T10:14:00Z</updated><author><name>Alexis Métaireau</name></author><id>tag:,2010-10-20:oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="/oh-yeah.html" rel="alternate"></link><updated>2010-10-20T10:14:00+00:00</updated><author><name>Alexis Métaireau</name></author><id>tag:,2010-10-20:oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="|filename|/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="/unbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00Z</updated><author><name></name></author><id>tag:,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="/unbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00+00:00</updated><author><name></name></author><id>tag:,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
@@ -57,5 +57,5 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
-</summary></entry><entry><title>The baz tag</title><link href="/tag/baz.html" rel="alternate"></link><updated>2010-03-14T00:00:00Z</updated><author><name></name></author><id>tag:,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</summary></entry></feed>
\ No newline at end of file
+</summary></entry><entry><title>The baz tag</title><link href="/tag/baz.html" rel="alternate"></link><updated>2010-03-14T00:00:00+00:00</updated><author><name></name></author><id>tag:,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</summary></entry></feed>
diff --git a/pelican/tests/output/basic/feeds/all-fr.atom.xml b/pelican/tests/output/basic/feeds/all-fr.atom.xml
index 98b9a681..54056df6 100644
--- a/pelican/tests/output/basic/feeds/all-fr.atom.xml
+++ b/pelican/tests/output/basic/feeds/all-fr.atom.xml
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/all-fr.atom.xml" rel="self"></link><id>/</id><updated>2012-02-29T00:00:00Z</updated><entry><title>Deuxième article</title><link href="/second-article-fr.html" rel="alternate"></link><updated>2012-02-29T00:00:00Z</updated><author><name></name></author><id>tag:,2012-02-29:second-article-fr.html</id><summary type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry></feed>
\ No newline at end of file
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/all-fr.atom.xml" rel="self"></link><id>/</id><updated>2012-02-29T00:00:00+00:00</updated><entry><title>Deuxième article</title><link href="/second-article-fr.html" rel="alternate"></link><updated>2012-02-29T00:00:00+00:00</updated><author><name></name></author><id>tag:,2012-02-29:second-article-fr.html</id><summary type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry></feed>
diff --git a/pelican/tests/output/basic/feeds/all.atom.xml b/pelican/tests/output/basic/feeds/all.atom.xml
index 3cf2d197..3a9478a4 100644
--- a/pelican/tests/output/basic/feeds/all.atom.xml
+++ b/pelican/tests/output/basic/feeds/all.atom.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/all.atom.xml" rel="self"></link><id>/</id><updated>2013-11-17T23:29:00Z</updated><entry><title>FILENAME_METADATA example</title><link href="/filename_metadata-example.html" rel="alternate"></link><updated>2012-11-30T00:00:00Z</updated><author><name></name></author><id>tag:,2012-11-30:filename_metadata-example.html</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</summary></entry><entry><title>Second article</title><link href="/second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00Z</updated><author><name></name></author><id>tag:,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Deuxième article</title><link href="/second-article-fr.html" rel="alternate"></link><updated>2012-02-29T00:00:00Z</updated><author><name></name></author><id>tag:,2012-02-29:second-article-fr.html</id><summary type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="/a-markdown-powered-article.html" rel="alternate"></link><updated>2011-04-20T00:00:00Z</updated><author><name></name></author><id>tag:,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/all.atom.xml" rel="self"></link><id>/</id><updated>2013-11-17T23:29:00+00:00</updated><entry><title>FILENAME_METADATA example</title><link href="/filename_metadata-example.html" rel="alternate"></link><updated>2012-11-30T00:00:00+00:00</updated><author><name></name></author><id>tag:,2012-11-30:filename_metadata-example.html</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</summary></entry><entry><title>Second article</title><link href="/second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00+00:00</updated><author><name></name></author><id>tag:,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Deuxième article</title><link href="/second-article-fr.html" rel="alternate"></link><updated>2012-02-29T00:00:00+00:00</updated><author><name></name></author><id>tag:,2012-02-29:second-article-fr.html</id><summary type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="/a-markdown-powered-article.html" rel="alternate"></link><updated>2011-04-20T00:00:00+00:00</updated><author><name></name></author><id>tag:,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="/unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="/article-1.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name></name></author><id>tag:,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</summary></entry><entry><title>Article 2</title><link href="/article-2.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name></name></author><id>tag:,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</summary></entry><entry><title>Article 3</title><link href="/article-3.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name></name></author><id>tag:,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
-</summary></entry><entry><title>This is a super article !</title><link href="/this-is-a-super-article.html" rel="alternate"></link><updated>2013-11-17T23:29:00Z</updated><author><name>Alexis Métaireau</name></author><id>tag:,2010-12-02:this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
+&lt;a href="/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="/article-1.html" rel="alternate"></link><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</summary></entry><entry><title>Article 2</title><link href="/article-2.html" rel="alternate"></link><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</summary></entry><entry><title>Article 3</title><link href="/article-3.html" rel="alternate"></link><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
+</summary></entry><entry><title>This is a super article !</title><link href="/this-is-a-super-article.html" rel="alternate"></link><updated>2013-11-17T23:29:00+00:00</updated><author><name>Alexis Métaireau</name></author><id>tag:,2010-12-02:this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
@@ -19,13 +19,13 @@
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="/oh-yeah.html" rel="alternate"></link><updated>2010-10-20T10:14:00Z</updated><author><name>Alexis Métaireau</name></author><id>tag:,2010-10-20:oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="/oh-yeah.html" rel="alternate"></link><updated>2010-10-20T10:14:00+00:00</updated><author><name>Alexis Métaireau</name></author><id>tag:,2010-10-20:oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="|filename|/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="/unbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00Z</updated><author><name></name></author><id>tag:,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="/unbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00+00:00</updated><author><name></name></author><id>tag:,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
@@ -58,5 +58,5 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
-</summary></entry><entry><title>The baz tag</title><link href="/tag/baz.html" rel="alternate"></link><updated>2010-03-14T00:00:00Z</updated><author><name></name></author><id>tag:,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</summary></entry></feed>
\ No newline at end of file
+</summary></entry><entry><title>The baz tag</title><link href="/tag/baz.html" rel="alternate"></link><updated>2010-03-14T00:00:00+00:00</updated><author><name></name></author><id>tag:,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</summary></entry></feed>
diff --git a/pelican/tests/output/basic/feeds/bar.atom.xml b/pelican/tests/output/basic/feeds/bar.atom.xml
index 2c988122..d1c678ae 100644
--- a/pelican/tests/output/basic/feeds/bar.atom.xml
+++ b/pelican/tests/output/basic/feeds/bar.atom.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/bar.atom.xml" rel="self"></link><id>/</id><updated>2010-10-20T10:14:00Z</updated><entry><title>Oh yeah !</title><link href="/oh-yeah.html" rel="alternate"></link><updated>2010-10-20T10:14:00Z</updated><author><name>Alexis Métaireau</name></author><id>tag:,2010-10-20:oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/bar.atom.xml" rel="self"></link><id>/</id><updated>2010-10-20T10:14:00+00:00</updated><entry><title>Oh yeah !</title><link href="/oh-yeah.html" rel="alternate"></link><updated>2010-10-20T10:14:00+00:00</updated><author><name>Alexis Métaireau</name></author><id>tag:,2010-10-20:oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="|filename|/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry></feed>
\ No newline at end of file
+</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry></feed>
diff --git a/pelican/tests/output/basic/feeds/cat1.atom.xml b/pelican/tests/output/basic/feeds/cat1.atom.xml
index 2fa534aa..a3c35956 100644
--- a/pelican/tests/output/basic/feeds/cat1.atom.xml
+++ b/pelican/tests/output/basic/feeds/cat1.atom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/cat1.atom.xml" rel="self"></link><id>/</id><updated>2011-04-20T00:00:00Z</updated><entry><title>A markdown powered article</title><link href="/a-markdown-powered-article.html" rel="alternate"></link><updated>2011-04-20T00:00:00Z</updated><author><name></name></author><id>tag:,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/cat1.atom.xml" rel="self"></link><id>/</id><updated>2011-04-20T00:00:00+00:00</updated><entry><title>A markdown powered article</title><link href="/a-markdown-powered-article.html" rel="alternate"></link><updated>2011-04-20T00:00:00+00:00</updated><author><name></name></author><id>tag:,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="/unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="/article-1.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name></name></author><id>tag:,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</summary></entry><entry><title>Article 2</title><link href="/article-2.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name></name></author><id>tag:,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</summary></entry><entry><title>Article 3</title><link href="/article-3.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name></name></author><id>tag:,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
-</summary></entry></feed>
\ No newline at end of file
+&lt;a href="/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="/article-1.html" rel="alternate"></link><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</summary></entry><entry><title>Article 2</title><link href="/article-2.html" rel="alternate"></link><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</summary></entry><entry><title>Article 3</title><link href="/article-3.html" rel="alternate"></link><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
+</summary></entry></feed>
diff --git a/pelican/tests/output/basic/feeds/misc.atom.xml b/pelican/tests/output/basic/feeds/misc.atom.xml
index 8b988614..a9b5977b 100644
--- a/pelican/tests/output/basic/feeds/misc.atom.xml
+++ b/pelican/tests/output/basic/feeds/misc.atom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/misc.atom.xml" rel="self"></link><id>/</id><updated>2012-11-30T00:00:00Z</updated><entry><title>FILENAME_METADATA example</title><link href="/filename_metadata-example.html" rel="alternate"></link><updated>2012-11-30T00:00:00Z</updated><author><name></name></author><id>tag:,2012-11-30:filename_metadata-example.html</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</summary></entry><entry><title>Second article</title><link href="/second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00Z</updated><author><name></name></author><id>tag:,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Unbelievable !</title><link href="/unbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00Z</updated><author><name></name></author><id>tag:,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/misc.atom.xml" rel="self"></link><id>/</id><updated>2012-11-30T00:00:00+00:00</updated><entry><title>FILENAME_METADATA example</title><link href="/filename_metadata-example.html" rel="alternate"></link><updated>2012-11-30T00:00:00+00:00</updated><author><name></name></author><id>tag:,2012-11-30:filename_metadata-example.html</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</summary></entry><entry><title>Second article</title><link href="/second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00+00:00</updated><author><name></name></author><id>tag:,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Unbelievable !</title><link href="/unbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00+00:00</updated><author><name></name></author><id>tag:,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
@@ -34,5 +34,5 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
-</summary></entry><entry><title>The baz tag</title><link href="/tag/baz.html" rel="alternate"></link><updated>2010-03-14T00:00:00Z</updated><author><name></name></author><id>tag:,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</summary></entry></feed>
\ No newline at end of file
+</summary></entry><entry><title>The baz tag</title><link href="/tag/baz.html" rel="alternate"></link><updated>2010-03-14T00:00:00+00:00</updated><author><name></name></author><id>tag:,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</summary></entry></feed>
diff --git a/pelican/tests/output/basic/feeds/yeah.atom.xml b/pelican/tests/output/basic/feeds/yeah.atom.xml
index 2c42ec39..0df396a2 100644
--- a/pelican/tests/output/basic/feeds/yeah.atom.xml
+++ b/pelican/tests/output/basic/feeds/yeah.atom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/yeah.atom.xml" rel="self"></link><id>/</id><updated>2013-11-17T23:29:00Z</updated><entry><title>This is a super article !</title><link href="/this-is-a-super-article.html" rel="alternate"></link><updated>2013-11-17T23:29:00Z</updated><author><name>Alexis Métaireau</name></author><id>tag:,2010-12-02:this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/yeah.atom.xml" rel="self"></link><id>/</id><updated>2013-11-17T23:29:00+00:00</updated><entry><title>This is a super article !</title><link href="/this-is-a-super-article.html" rel="alternate"></link><updated>2013-11-17T23:29:00+00:00</updated><author><name>Alexis Métaireau</name></author><id>tag:,2010-12-02:this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
@@ -11,4 +11,4 @@
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry></feed>
\ No newline at end of file
+</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry></feed>
diff --git a/pelican/tests/output/basic/filename_metadata-example.html b/pelican/tests/output/basic/filename_metadata-example.html
index 80e39129..638c65dd 100644
--- a/pelican/tests/output/basic/filename_metadata-example.html
+++ b/pelican/tests/output/basic/filename_metadata-example.html
@@ -34,7 +34,7 @@
 
     <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2012-11-30T00:00:00">
+        <abbr class="published" title="2012-11-30T00:00:00+00:00">
                 Published: Fri 30 November 2012
         </abbr>
 
@@ -65,4 +65,4 @@
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/basic/index.html b/pelican/tests/output/basic/index.html
index ffc476f4..f3814b00 100644
--- a/pelican/tests/output/basic/index.html
+++ b/pelican/tests/output/basic/index.html
@@ -29,7 +29,7 @@
                 <article>
                     <h1 class="entry-title"><a href="/filename_metadata-example.html">FILENAME_METADATA example</a></h1>
 <footer class="post-info">
-        <abbr class="published" title="2012-11-30T00:00:00">
+        <abbr class="published" title="2012-11-30T00:00:00+00:00">
                 Published: Fri 30 November 2012
         </abbr>
 
@@ -51,7 +51,7 @@
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2012-02-29T00:00:00">
+        <abbr class="published" title="2012-02-29T00:00:00+00:00">
                 Published: Wed 29 February 2012
         </abbr>
 
@@ -73,7 +73,7 @@
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2011-04-20T00:00:00">
+        <abbr class="published" title="2011-04-20T00:00:00+00:00">
                 Published: Wed 20 April 2011
         </abbr>
 
@@ -94,7 +94,7 @@
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2011-02-17T00:00:00">
+        <abbr class="published" title="2011-02-17T00:00:00+00:00">
                 Published: Thu 17 February 2011
         </abbr>
 
@@ -114,7 +114,7 @@
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2011-02-17T00:00:00">
+        <abbr class="published" title="2011-02-17T00:00:00+00:00">
                 Published: Thu 17 February 2011
         </abbr>
 
@@ -134,7 +134,7 @@
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2011-02-17T00:00:00">
+        <abbr class="published" title="2011-02-17T00:00:00+00:00">
                 Published: Thu 17 February 2011
         </abbr>
 
@@ -154,11 +154,11 @@
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2010-12-02T10:14:00">
+        <abbr class="published" title="2010-12-02T10:14:00+00:00">
                 Published: Thu 02 December 2010
         </abbr>
 		<br />
-        <abbr class="modified" title="2013-11-17T23:29:00">
+        <abbr class="modified" title="2013-11-17T23:29:00+00:00">
                 Updated: Sun 17 November 2013
         </abbr>
 
@@ -182,7 +182,7 @@ as well as <strong>inline markup</strong>.</p>
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2010-10-20T10:14:00">
+        <abbr class="published" title="2010-10-20T10:14:00+00:00">
                 Published: Wed 20 October 2010
         </abbr>
 
@@ -210,7 +210,7 @@ YEAH !</p>
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2010-10-15T20:30:00">
+        <abbr class="published" title="2010-10-15T20:30:00+00:00">
                 Published: Fri 15 October 2010
         </abbr>
 
@@ -240,7 +240,7 @@ pelican.conf, it ...</p></div>
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2010-03-14T00:00:00">
+        <abbr class="published" title="2010-03-14T00:00:00+00:00">
                 Published: Sun 14 March 2010
         </abbr>
 
@@ -272,4 +272,4 @@ pelican.conf, it ...</p></div>
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/basic/oh-yeah.html b/pelican/tests/output/basic/oh-yeah.html
index 3265402d..76be69fe 100644
--- a/pelican/tests/output/basic/oh-yeah.html
+++ b/pelican/tests/output/basic/oh-yeah.html
@@ -34,7 +34,7 @@
 
     <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2010-10-20T10:14:00">
+        <abbr class="published" title="2010-10-20T10:14:00+00:00">
                 Published: Wed 20 October 2010
         </abbr>
 
@@ -73,4 +73,4 @@ YEAH !</p>
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/basic/override/index.html b/pelican/tests/output/basic/override/index.html
index 30cd50e0..ed9fa92a 100644
--- a/pelican/tests/output/basic/override/index.html
+++ b/pelican/tests/output/basic/override/index.html
@@ -50,4 +50,4 @@ at a custom location.</p>
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/basic/pages/this-is-a-test-hidden-page.html b/pelican/tests/output/basic/pages/this-is-a-test-hidden-page.html
index 6da5d3c1..ac31987a 100644
--- a/pelican/tests/output/basic/pages/this-is-a-test-hidden-page.html
+++ b/pelican/tests/output/basic/pages/this-is-a-test-hidden-page.html
@@ -50,4 +50,4 @@ Anyone can see this page but it's not linked to anywhere!</p>
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/basic/pages/this-is-a-test-page.html b/pelican/tests/output/basic/pages/this-is-a-test-page.html
index b0932c5d..43e5f72e 100644
--- a/pelican/tests/output/basic/pages/this-is-a-test-page.html
+++ b/pelican/tests/output/basic/pages/this-is-a-test-page.html
@@ -50,4 +50,4 @@
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/basic/second-article-fr.html b/pelican/tests/output/basic/second-article-fr.html
index 01ed70f2..551027da 100644
--- a/pelican/tests/output/basic/second-article-fr.html
+++ b/pelican/tests/output/basic/second-article-fr.html
@@ -34,7 +34,7 @@
 
     <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2012-02-29T00:00:00">
+        <abbr class="published" title="2012-02-29T00:00:00+00:00">
                 Published: Wed 29 February 2012
         </abbr>
 
@@ -67,4 +67,4 @@
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/basic/second-article.html b/pelican/tests/output/basic/second-article.html
index ddb379d6..ed350752 100644
--- a/pelican/tests/output/basic/second-article.html
+++ b/pelican/tests/output/basic/second-article.html
@@ -34,7 +34,7 @@
 
     <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2012-02-29T00:00:00">
+        <abbr class="published" title="2012-02-29T00:00:00+00:00">
                 Published: Wed 29 February 2012
         </abbr>
 
@@ -67,4 +67,4 @@
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/basic/tag/bar.html b/pelican/tests/output/basic/tag/bar.html
index d983f3dc..5331767b 100644
--- a/pelican/tests/output/basic/tag/bar.html
+++ b/pelican/tests/output/basic/tag/bar.html
@@ -29,7 +29,7 @@
                 <article>
                     <h1 class="entry-title"><a href="/second-article.html">Second article</a></h1>
 <footer class="post-info">
-        <abbr class="published" title="2012-02-29T00:00:00">
+        <abbr class="published" title="2012-02-29T00:00:00+00:00">
                 Published: Wed 29 February 2012
         </abbr>
 
@@ -53,11 +53,11 @@
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2010-12-02T10:14:00">
+        <abbr class="published" title="2010-12-02T10:14:00+00:00">
                 Published: Thu 02 December 2010
         </abbr>
 		<br />
-        <abbr class="modified" title="2013-11-17T23:29:00">
+        <abbr class="modified" title="2013-11-17T23:29:00+00:00">
                 Updated: Sun 17 November 2013
         </abbr>
 
@@ -81,7 +81,7 @@ as well as <strong>inline markup</strong>.</p>
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2010-10-20T10:14:00">
+        <abbr class="published" title="2010-10-20T10:14:00+00:00">
                 Published: Wed 20 October 2010
         </abbr>
 
@@ -121,4 +121,4 @@ YEAH !</p>
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/basic/tag/baz.html b/pelican/tests/output/basic/tag/baz.html
index a6cc9e9b..dc26d8e1 100644
--- a/pelican/tests/output/basic/tag/baz.html
+++ b/pelican/tests/output/basic/tag/baz.html
@@ -34,7 +34,7 @@
 
     <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2010-03-14T00:00:00">
+        <abbr class="published" title="2010-03-14T00:00:00+00:00">
                 Published: Sun 14 March 2010
         </abbr>
 
@@ -65,4 +65,4 @@
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/basic/tag/foo.html b/pelican/tests/output/basic/tag/foo.html
index 4bebd99d..aed3ad17 100644
--- a/pelican/tests/output/basic/tag/foo.html
+++ b/pelican/tests/output/basic/tag/foo.html
@@ -29,7 +29,7 @@
                 <article>
                     <h1 class="entry-title"><a href="/second-article.html">Second article</a></h1>
 <footer class="post-info">
-        <abbr class="published" title="2012-02-29T00:00:00">
+        <abbr class="published" title="2012-02-29T00:00:00+00:00">
                 Published: Wed 29 February 2012
         </abbr>
 
@@ -53,11 +53,11 @@
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2010-12-02T10:14:00">
+        <abbr class="published" title="2010-12-02T10:14:00+00:00">
                 Published: Thu 02 December 2010
         </abbr>
 		<br />
-        <abbr class="modified" title="2013-11-17T23:29:00">
+        <abbr class="modified" title="2013-11-17T23:29:00+00:00">
                 Updated: Sun 17 November 2013
         </abbr>
 
@@ -93,4 +93,4 @@ as well as <strong>inline markup</strong>.</p>
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/basic/tag/foobar.html b/pelican/tests/output/basic/tag/foobar.html
index f3035f8e..540cde25 100644
--- a/pelican/tests/output/basic/tag/foobar.html
+++ b/pelican/tests/output/basic/tag/foobar.html
@@ -29,11 +29,11 @@
                 <article>
                     <h1 class="entry-title"><a href="/this-is-a-super-article.html">This is a super article !</a></h1>
 <footer class="post-info">
-        <abbr class="published" title="2010-12-02T10:14:00">
+        <abbr class="published" title="2010-12-02T10:14:00+00:00">
                 Published: Thu 02 December 2010
         </abbr>
 		<br />
-        <abbr class="modified" title="2013-11-17T23:29:00">
+        <abbr class="modified" title="2013-11-17T23:29:00+00:00">
                 Updated: Sun 17 November 2013
         </abbr>
 
diff --git a/pelican/tests/output/basic/tag/yeah.html b/pelican/tests/output/basic/tag/yeah.html
index cd9d01b2..b8da2bc6 100644
--- a/pelican/tests/output/basic/tag/yeah.html
+++ b/pelican/tests/output/basic/tag/yeah.html
@@ -29,7 +29,7 @@
                 <article>
                     <h1 class="entry-title"><a href="/oh-yeah.html">Oh yeah !</a></h1>
 <footer class="post-info">
-        <abbr class="published" title="2010-10-20T10:14:00">
+        <abbr class="published" title="2010-10-20T10:14:00+00:00">
                 Published: Wed 20 October 2010
         </abbr>
 
diff --git a/pelican/tests/output/basic/this-is-a-super-article.html b/pelican/tests/output/basic/this-is-a-super-article.html
index deeb27a1..cf957ebf 100644
--- a/pelican/tests/output/basic/this-is-a-super-article.html
+++ b/pelican/tests/output/basic/this-is-a-super-article.html
@@ -34,11 +34,11 @@
 
     <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2010-12-02T10:14:00">
+        <abbr class="published" title="2010-12-02T10:14:00+00:00">
                 Published: Thu 02 December 2010
         </abbr>
 		<br />
-        <abbr class="modified" title="2013-11-17T23:29:00">
+        <abbr class="modified" title="2013-11-17T23:29:00+00:00">
                 Updated: Sun 17 November 2013
         </abbr>
 
@@ -83,4 +83,4 @@
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/basic/unbelievable.html b/pelican/tests/output/basic/unbelievable.html
index f9f38a79..b9b52031 100644
--- a/pelican/tests/output/basic/unbelievable.html
+++ b/pelican/tests/output/basic/unbelievable.html
@@ -34,7 +34,7 @@
 
     <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2010-10-15T20:30:00">
+        <abbr class="published" title="2010-10-15T20:30:00+00:00">
                 Published: Fri 15 October 2010
         </abbr>
 
@@ -97,4 +97,4 @@ pelican.conf, it will have nothing in default.</p>
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom/a-markdown-powered-article.html b/pelican/tests/output/custom/a-markdown-powered-article.html
index 5b2aca1c..577d61b8 100644
--- a/pelican/tests/output/custom/a-markdown-powered-article.html
+++ b/pelican/tests/output/custom/a-markdown-powered-article.html
@@ -38,7 +38,7 @@
 
     <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2011-04-20T00:00:00">
+        <abbr class="published" title="2011-04-20T00:00:00+02:00">
                 Published: Wed 20 April 2011
         </abbr>
 
@@ -112,4 +112,4 @@
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom/article-1.html b/pelican/tests/output/custom/article-1.html
index 4319026f..dea09247 100644
--- a/pelican/tests/output/custom/article-1.html
+++ b/pelican/tests/output/custom/article-1.html
@@ -38,7 +38,7 @@
 
     <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2011-02-17T00:00:00">
+        <abbr class="published" title="2011-02-17T00:00:00+01:00">
                 Published: Thu 17 February 2011
         </abbr>
 
@@ -111,4 +111,4 @@
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom/article-2.html b/pelican/tests/output/custom/article-2.html
index 9b00fde2..8d8ad1b3 100644
--- a/pelican/tests/output/custom/article-2.html
+++ b/pelican/tests/output/custom/article-2.html
@@ -38,7 +38,7 @@
 
     <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2011-02-17T00:00:00">
+        <abbr class="published" title="2011-02-17T00:00:00+01:00">
                 Published: Thu 17 February 2011
         </abbr>
 
@@ -111,4 +111,4 @@
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom/article-3.html b/pelican/tests/output/custom/article-3.html
index 4bbd0819..7539e0f9 100644
--- a/pelican/tests/output/custom/article-3.html
+++ b/pelican/tests/output/custom/article-3.html
@@ -38,7 +38,7 @@
 
     <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2011-02-17T00:00:00">
+        <abbr class="published" title="2011-02-17T00:00:00+01:00">
                 Published: Thu 17 February 2011
         </abbr>
 
@@ -111,4 +111,4 @@
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom/author/alexis-metaireau.html b/pelican/tests/output/custom/author/alexis-metaireau.html
index cb975d3a..cb6d93a9 100644
--- a/pelican/tests/output/custom/author/alexis-metaireau.html
+++ b/pelican/tests/output/custom/author/alexis-metaireau.html
@@ -33,7 +33,7 @@
                 <article>
                     <h1 class="entry-title"><a href="../filename_metadata-example.html">FILENAME_METADATA example</a></h1>
 <footer class="post-info">
-        <abbr class="published" title="2012-11-30T00:00:00">
+        <abbr class="published" title="2012-11-30T00:00:00+01:00">
                 Published: Fri 30 November 2012
         </abbr>
 
@@ -58,7 +58,7 @@
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2012-02-29T00:00:00">
+        <abbr class="published" title="2012-02-29T00:00:00+01:00">
                 Published: Wed 29 February 2012
         </abbr>
 
@@ -83,7 +83,7 @@
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2011-04-20T00:00:00">
+        <abbr class="published" title="2011-04-20T00:00:00+02:00">
                 Published: Wed 20 April 2011
         </abbr>
 
@@ -107,7 +107,7 @@
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2011-02-17T00:00:00">
+        <abbr class="published" title="2011-02-17T00:00:00+01:00">
                 Published: Thu 17 February 2011
         </abbr>
 
@@ -170,4 +170,4 @@
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom/author/alexis-metaireau2.html b/pelican/tests/output/custom/author/alexis-metaireau2.html
index 8d67a25c..abf5bdbb 100644
--- a/pelican/tests/output/custom/author/alexis-metaireau2.html
+++ b/pelican/tests/output/custom/author/alexis-metaireau2.html
@@ -39,7 +39,7 @@
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2011-02-17T00:00:00">
+        <abbr class="published" title="2011-02-17T00:00:00+01:00">
                 Published: Thu 17 February 2011
         </abbr>
 
@@ -62,7 +62,7 @@
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2011-02-17T00:00:00">
+        <abbr class="published" title="2011-02-17T00:00:00+01:00">
                 Published: Thu 17 February 2011
         </abbr>
 
@@ -85,11 +85,11 @@
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2010-12-02T10:14:00">
+        <abbr class="published" title="2010-12-02T10:14:00+01:00">
                 Published: Thu 02 December 2010
         </abbr>
 		<br />
-        <abbr class="modified" title="2013-11-17T23:29:00">
+        <abbr class="modified" title="2013-11-17T23:29:00+01:00">
                 Updated: Sun 17 November 2013
         </abbr>
 
@@ -113,7 +113,7 @@ as well as <strong>inline markup</strong>.</p>
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2010-10-20T10:14:00">
+        <abbr class="published" title="2010-10-20T10:14:00+02:00">
                 Published: Wed 20 October 2010
         </abbr>
 
@@ -184,4 +184,4 @@ YEAH !</p>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom/author/alexis-metaireau3.html b/pelican/tests/output/custom/author/alexis-metaireau3.html
index 8df03fc6..30aa3eff 100644
--- a/pelican/tests/output/custom/author/alexis-metaireau3.html
+++ b/pelican/tests/output/custom/author/alexis-metaireau3.html
@@ -39,7 +39,7 @@
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2010-10-15T20:30:00">
+        <abbr class="published" title="2010-10-15T20:30:00+02:00">
                 Published: Fri 15 October 2010
         </abbr>
 
@@ -72,7 +72,7 @@ pelican.conf, it ...</p></div>
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2010-03-14T00:00:00">
+        <abbr class="published" title="2010-03-14T00:00:00+01:00">
                 Published: Sun 14 March 2010
         </abbr>
 
diff --git a/pelican/tests/output/custom/category/bar.html b/pelican/tests/output/custom/category/bar.html
index 80c46de5..9ab46a2e 100644
--- a/pelican/tests/output/custom/category/bar.html
+++ b/pelican/tests/output/custom/category/bar.html
@@ -33,7 +33,7 @@
                 <article>
                     <h1 class="entry-title"><a href="../oh-yeah.html">Oh yeah !</a></h1>
 <footer class="post-info">
-        <abbr class="published" title="2010-10-20T10:14:00">
+        <abbr class="published" title="2010-10-20T10:14:00+02:00">
                 Published: Wed 20 October 2010
         </abbr>
 
diff --git a/pelican/tests/output/custom/category/cat1.html b/pelican/tests/output/custom/category/cat1.html
index c6bcafca..76075edf 100644
--- a/pelican/tests/output/custom/category/cat1.html
+++ b/pelican/tests/output/custom/category/cat1.html
@@ -33,7 +33,7 @@
                 <article>
                     <h1 class="entry-title"><a href="../a-markdown-powered-article.html">A markdown powered article</a></h1>
 <footer class="post-info">
-        <abbr class="published" title="2011-04-20T00:00:00">
+        <abbr class="published" title="2011-04-20T00:00:00+02:00">
                 Published: Wed 20 April 2011
         </abbr>
 
@@ -59,7 +59,7 @@
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2011-02-17T00:00:00">
+        <abbr class="published" title="2011-02-17T00:00:00+01:00">
                 Published: Thu 17 February 2011
         </abbr>
 
@@ -82,7 +82,7 @@
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2011-02-17T00:00:00">
+        <abbr class="published" title="2011-02-17T00:00:00+01:00">
                 Published: Thu 17 February 2011
         </abbr>
 
@@ -105,7 +105,7 @@
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2011-02-17T00:00:00">
+        <abbr class="published" title="2011-02-17T00:00:00+01:00">
                 Published: Thu 17 February 2011
         </abbr>
 
diff --git a/pelican/tests/output/custom/category/misc.html b/pelican/tests/output/custom/category/misc.html
index ccb7d949..3a470b7e 100644
--- a/pelican/tests/output/custom/category/misc.html
+++ b/pelican/tests/output/custom/category/misc.html
@@ -33,7 +33,7 @@
                 <article>
                     <h1 class="entry-title"><a href="../filename_metadata-example.html">FILENAME_METADATA example</a></h1>
 <footer class="post-info">
-        <abbr class="published" title="2012-11-30T00:00:00">
+        <abbr class="published" title="2012-11-30T00:00:00+01:00">
                 Published: Fri 30 November 2012
         </abbr>
 
@@ -58,7 +58,7 @@
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2012-02-29T00:00:00">
+        <abbr class="published" title="2012-02-29T00:00:00+01:00">
                 Published: Wed 29 February 2012
         </abbr>
 
@@ -83,7 +83,7 @@
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2010-10-15T20:30:00">
+        <abbr class="published" title="2010-10-15T20:30:00+02:00">
                 Published: Fri 15 October 2010
         </abbr>
 
@@ -116,7 +116,7 @@ pelican.conf, it ...</p></div>
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2010-03-14T00:00:00">
+        <abbr class="published" title="2010-03-14T00:00:00+01:00">
                 Published: Sun 14 March 2010
         </abbr>
 
diff --git a/pelican/tests/output/custom/category/yeah.html b/pelican/tests/output/custom/category/yeah.html
index 11fd181d..a632664f 100644
--- a/pelican/tests/output/custom/category/yeah.html
+++ b/pelican/tests/output/custom/category/yeah.html
@@ -33,11 +33,11 @@
                 <article>
                     <h1 class="entry-title"><a href="../this-is-a-super-article.html">This is a super article !</a></h1>
 <footer class="post-info">
-        <abbr class="published" title="2010-12-02T10:14:00">
+        <abbr class="published" title="2010-12-02T10:14:00+01:00">
                 Published: Thu 02 December 2010
         </abbr>
 		<br />
-        <abbr class="modified" title="2013-11-17T23:29:00">
+        <abbr class="modified" title="2013-11-17T23:29:00+01:00">
                 Updated: Sun 17 November 2013
         </abbr>
 
diff --git a/pelican/tests/output/custom/drafts/a-draft-article.html b/pelican/tests/output/custom/drafts/a-draft-article.html
index 57eea18c..15a3f1db 100644
--- a/pelican/tests/output/custom/drafts/a-draft-article.html
+++ b/pelican/tests/output/custom/drafts/a-draft-article.html
@@ -38,7 +38,7 @@
 
     <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2012-03-02T14:01:01">
+        <abbr class="published" title="2012-03-02T14:01:01+01:00">
                 Published: Fri 02 March 2012
         </abbr>
 
diff --git a/pelican/tests/output/custom/filename_metadata-example.html b/pelican/tests/output/custom/filename_metadata-example.html
index 5d22e0eb..047f12af 100644
--- a/pelican/tests/output/custom/filename_metadata-example.html
+++ b/pelican/tests/output/custom/filename_metadata-example.html
@@ -38,7 +38,7 @@
 
     <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2012-11-30T00:00:00">
+        <abbr class="published" title="2012-11-30T00:00:00+01:00">
                 Published: Fri 30 November 2012
         </abbr>
 
diff --git a/pelican/tests/output/custom/index.html b/pelican/tests/output/custom/index.html
index c46e8739..c375b208 100644
--- a/pelican/tests/output/custom/index.html
+++ b/pelican/tests/output/custom/index.html
@@ -33,7 +33,7 @@
                 <article>
                     <h1 class="entry-title"><a href="./filename_metadata-example.html">FILENAME_METADATA example</a></h1>
 <footer class="post-info">
-        <abbr class="published" title="2012-11-30T00:00:00">
+        <abbr class="published" title="2012-11-30T00:00:00+01:00">
                 Published: Fri 30 November 2012
         </abbr>
 
@@ -58,7 +58,7 @@
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2012-02-29T00:00:00">
+        <abbr class="published" title="2012-02-29T00:00:00+01:00">
                 Published: Wed 29 February 2012
         </abbr>
 
@@ -83,7 +83,7 @@
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2011-04-20T00:00:00">
+        <abbr class="published" title="2011-04-20T00:00:00+02:00">
                 Published: Wed 20 April 2011
         </abbr>
 
@@ -107,7 +107,7 @@
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2011-02-17T00:00:00">
+        <abbr class="published" title="2011-02-17T00:00:00+01:00">
                 Published: Thu 17 February 2011
         </abbr>
 
diff --git a/pelican/tests/output/custom/index2.html b/pelican/tests/output/custom/index2.html
index 3cc5623f..1f2479d6 100644
--- a/pelican/tests/output/custom/index2.html
+++ b/pelican/tests/output/custom/index2.html
@@ -39,7 +39,7 @@
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2011-02-17T00:00:00">
+        <abbr class="published" title="2011-02-17T00:00:00+01:00">
                 Published: Thu 17 February 2011
         </abbr>
 
@@ -62,7 +62,7 @@
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2011-02-17T00:00:00">
+        <abbr class="published" title="2011-02-17T00:00:00+01:00">
                 Published: Thu 17 February 2011
         </abbr>
 
@@ -85,11 +85,11 @@
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2010-12-02T10:14:00">
+        <abbr class="published" title="2010-12-02T10:14:00+01:00">
                 Published: Thu 02 December 2010
         </abbr>
 		<br />
-        <abbr class="modified" title="2013-11-17T23:29:00">
+        <abbr class="modified" title="2013-11-17T23:29:00+01:00">
                 Updated: Sun 17 November 2013
         </abbr>
 
@@ -113,7 +113,7 @@ as well as <strong>inline markup</strong>.</p>
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2010-10-20T10:14:00">
+        <abbr class="published" title="2010-10-20T10:14:00+02:00">
                 Published: Wed 20 October 2010
         </abbr>
 
@@ -184,4 +184,4 @@ YEAH !</p>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom/index3.html b/pelican/tests/output/custom/index3.html
index e08af17e..e7e4f34a 100644
--- a/pelican/tests/output/custom/index3.html
+++ b/pelican/tests/output/custom/index3.html
@@ -39,7 +39,7 @@
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2010-10-15T20:30:00">
+        <abbr class="published" title="2010-10-15T20:30:00+02:00">
                 Published: Fri 15 October 2010
         </abbr>
 
@@ -72,7 +72,7 @@ pelican.conf, it ...</p></div>
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2010-03-14T00:00:00">
+        <abbr class="published" title="2010-03-14T00:00:00+01:00">
                 Published: Sun 14 March 2010
         </abbr>
 
diff --git a/pelican/tests/output/custom/oh-yeah-fr.html b/pelican/tests/output/custom/oh-yeah-fr.html
index 39f68495..fa02ac2b 100644
--- a/pelican/tests/output/custom/oh-yeah-fr.html
+++ b/pelican/tests/output/custom/oh-yeah-fr.html
@@ -38,7 +38,7 @@
 
     <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2012-03-02T14:01:01">
+        <abbr class="published" title="2012-03-02T14:01:01+01:00">
                 Published: Fri 02 March 2012
         </abbr>
 
diff --git a/pelican/tests/output/custom/oh-yeah.html b/pelican/tests/output/custom/oh-yeah.html
index 5ad40219..6d108cf2 100644
--- a/pelican/tests/output/custom/oh-yeah.html
+++ b/pelican/tests/output/custom/oh-yeah.html
@@ -38,7 +38,7 @@
 
     <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2010-10-20T10:14:00">
+        <abbr class="published" title="2010-10-20T10:14:00+02:00">
                 Published: Wed 20 October 2010
         </abbr>
 
diff --git a/pelican/tests/output/custom/second-article-fr.html b/pelican/tests/output/custom/second-article-fr.html
index a70748b0..6c537609 100644
--- a/pelican/tests/output/custom/second-article-fr.html
+++ b/pelican/tests/output/custom/second-article-fr.html
@@ -38,7 +38,7 @@
 
     <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2012-02-29T00:00:00">
+        <abbr class="published" title="2012-02-29T00:00:00+01:00">
                 Published: Wed 29 February 2012
         </abbr>
 
diff --git a/pelican/tests/output/custom/second-article.html b/pelican/tests/output/custom/second-article.html
index b3ae9584..30179205 100644
--- a/pelican/tests/output/custom/second-article.html
+++ b/pelican/tests/output/custom/second-article.html
@@ -38,7 +38,7 @@
 
     <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2012-02-29T00:00:00">
+        <abbr class="published" title="2012-02-29T00:00:00+01:00">
                 Published: Wed 29 February 2012
         </abbr>
 
diff --git a/pelican/tests/output/custom/tag/bar.html b/pelican/tests/output/custom/tag/bar.html
index 1b7b21c5..28cbbe75 100644
--- a/pelican/tests/output/custom/tag/bar.html
+++ b/pelican/tests/output/custom/tag/bar.html
@@ -33,7 +33,7 @@
                 <article>
                     <h1 class="entry-title"><a href="../second-article.html">Second article</a></h1>
 <footer class="post-info">
-        <abbr class="published" title="2012-02-29T00:00:00">
+        <abbr class="published" title="2012-02-29T00:00:00+01:00">
                 Published: Wed 29 February 2012
         </abbr>
 
@@ -60,11 +60,11 @@
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2010-12-02T10:14:00">
+        <abbr class="published" title="2010-12-02T10:14:00+01:00">
                 Published: Thu 02 December 2010
         </abbr>
 		<br />
-        <abbr class="modified" title="2013-11-17T23:29:00">
+        <abbr class="modified" title="2013-11-17T23:29:00+01:00">
                 Updated: Sun 17 November 2013
         </abbr>
 
@@ -88,7 +88,7 @@ as well as <strong>inline markup</strong>.</p>
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2010-10-20T10:14:00">
+        <abbr class="published" title="2010-10-20T10:14:00+02:00">
                 Published: Wed 20 October 2010
         </abbr>
 
@@ -157,4 +157,4 @@ YEAH !</p>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom/tag/baz.html b/pelican/tests/output/custom/tag/baz.html
index 8609a6f7..06f3c301 100644
--- a/pelican/tests/output/custom/tag/baz.html
+++ b/pelican/tests/output/custom/tag/baz.html
@@ -38,7 +38,7 @@
 
     <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2010-03-14T00:00:00">
+        <abbr class="published" title="2010-03-14T00:00:00+01:00">
                 Published: Sun 14 March 2010
         </abbr>
 
diff --git a/pelican/tests/output/custom/tag/foo.html b/pelican/tests/output/custom/tag/foo.html
index e5c58b36..ba3c843e 100644
--- a/pelican/tests/output/custom/tag/foo.html
+++ b/pelican/tests/output/custom/tag/foo.html
@@ -33,7 +33,7 @@
                 <article>
                     <h1 class="entry-title"><a href="../second-article.html">Second article</a></h1>
 <footer class="post-info">
-        <abbr class="published" title="2012-02-29T00:00:00">
+        <abbr class="published" title="2012-02-29T00:00:00+01:00">
                 Published: Wed 29 February 2012
         </abbr>
 
@@ -60,11 +60,11 @@
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2010-12-02T10:14:00">
+        <abbr class="published" title="2010-12-02T10:14:00+01:00">
                 Published: Thu 02 December 2010
         </abbr>
 		<br />
-        <abbr class="modified" title="2013-11-17T23:29:00">
+        <abbr class="modified" title="2013-11-17T23:29:00+01:00">
                 Updated: Sun 17 November 2013
         </abbr>
 
@@ -127,4 +127,4 @@ as well as <strong>inline markup</strong>.</p>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom/tag/foobar.html b/pelican/tests/output/custom/tag/foobar.html
index c224992e..dc51889a 100644
--- a/pelican/tests/output/custom/tag/foobar.html
+++ b/pelican/tests/output/custom/tag/foobar.html
@@ -33,11 +33,11 @@
                 <article>
                     <h1 class="entry-title"><a href="../this-is-a-super-article.html">This is a super article !</a></h1>
 <footer class="post-info">
-        <abbr class="published" title="2010-12-02T10:14:00">
+        <abbr class="published" title="2010-12-02T10:14:00+01:00">
                 Published: Thu 02 December 2010
         </abbr>
 		<br />
-        <abbr class="modified" title="2013-11-17T23:29:00">
+        <abbr class="modified" title="2013-11-17T23:29:00+01:00">
                 Updated: Sun 17 November 2013
         </abbr>
 
diff --git a/pelican/tests/output/custom/tag/yeah.html b/pelican/tests/output/custom/tag/yeah.html
index 49c78359..3b09c6c5 100644
--- a/pelican/tests/output/custom/tag/yeah.html
+++ b/pelican/tests/output/custom/tag/yeah.html
@@ -33,7 +33,7 @@
                 <article>
                     <h1 class="entry-title"><a href="../oh-yeah.html">Oh yeah !</a></h1>
 <footer class="post-info">
-        <abbr class="published" title="2010-10-20T10:14:00">
+        <abbr class="published" title="2010-10-20T10:14:00+02:00">
                 Published: Wed 20 October 2010
         </abbr>
 
diff --git a/pelican/tests/output/custom/this-is-a-super-article.html b/pelican/tests/output/custom/this-is-a-super-article.html
index 757627c4..34ab434e 100644
--- a/pelican/tests/output/custom/this-is-a-super-article.html
+++ b/pelican/tests/output/custom/this-is-a-super-article.html
@@ -38,11 +38,11 @@
 
     <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2010-12-02T10:14:00">
+        <abbr class="published" title="2010-12-02T10:14:00+01:00">
                 Published: Thu 02 December 2010
         </abbr>
 		<br />
-        <abbr class="modified" title="2013-11-17T23:29:00">
+        <abbr class="modified" title="2013-11-17T23:29:00+01:00">
                 Updated: Sun 17 November 2013
         </abbr>
 
@@ -126,4 +126,4 @@
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom/unbelievable.html b/pelican/tests/output/custom/unbelievable.html
index 71416a97..395cd1b6 100644
--- a/pelican/tests/output/custom/unbelievable.html
+++ b/pelican/tests/output/custom/unbelievable.html
@@ -38,7 +38,7 @@
 
     <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2010-10-15T20:30:00">
+        <abbr class="published" title="2010-10-15T20:30:00+02:00">
                 Published: Fri 15 October 2010
         </abbr>
 
diff --git a/pelican/tests/output/custom_locale/author/alexis-metaireau.html b/pelican/tests/output/custom_locale/author/alexis-metaireau.html
index 7c2fa448..1882015e 100644
--- a/pelican/tests/output/custom_locale/author/alexis-metaireau.html
+++ b/pelican/tests/output/custom_locale/author/alexis-metaireau.html
@@ -33,7 +33,7 @@
                 <article>
                     <h1 class="entry-title"><a href="../posts/2012/novembre/30/filename_metadata-example/">FILENAME_METADATA example</a></h1>
 <footer class="post-info">
-        <abbr class="published" title="2012-11-30T00:00:00">
+        <abbr class="published" title="2012-11-30T00:00:00+01:00">
                 Published: 30 novembre 2012
         </abbr>
 
@@ -58,7 +58,7 @@
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2012-02-29T00:00:00">
+        <abbr class="published" title="2012-02-29T00:00:00+01:00">
                 Published: 29 février 2012
         </abbr>
 
@@ -83,7 +83,7 @@
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2011-04-20T00:00:00">
+        <abbr class="published" title="2011-04-20T00:00:00+02:00">
                 Published: 20 avril 2011
         </abbr>
 
@@ -107,7 +107,7 @@
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2011-02-17T00:00:00">
+        <abbr class="published" title="2011-02-17T00:00:00+01:00">
                 Published: 17 février 2011
         </abbr>
 
diff --git a/pelican/tests/output/custom_locale/author/alexis-metaireau2.html b/pelican/tests/output/custom_locale/author/alexis-metaireau2.html
index 9ba313da..d1b50107 100644
--- a/pelican/tests/output/custom_locale/author/alexis-metaireau2.html
+++ b/pelican/tests/output/custom_locale/author/alexis-metaireau2.html
@@ -39,7 +39,7 @@
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2011-02-17T00:00:00">
+        <abbr class="published" title="2011-02-17T00:00:00+01:00">
                 Published: 17 février 2011
         </abbr>
 
@@ -62,7 +62,7 @@
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2011-02-17T00:00:00">
+        <abbr class="published" title="2011-02-17T00:00:00+01:00">
                 Published: 17 février 2011
         </abbr>
 
@@ -85,11 +85,11 @@
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2010-12-02T10:14:00">
+        <abbr class="published" title="2010-12-02T10:14:00+01:00">
                 Published: 02 décembre 2010
         </abbr>
 		<br />
-        <abbr class="modified" title="2013-11-17T23:29:00">
+        <abbr class="modified" title="2013-11-17T23:29:00+01:00">
                 Updated: 17 novembre 2013
         </abbr>
 
@@ -113,7 +113,7 @@ as well as <strong>inline markup</strong>.</p>
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2010-10-20T10:14:00">
+        <abbr class="published" title="2010-10-20T10:14:00+02:00">
                 Published: 20 octobre 2010
         </abbr>
 
@@ -184,4 +184,4 @@ YEAH !</p>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom_locale/author/alexis-metaireau3.html b/pelican/tests/output/custom_locale/author/alexis-metaireau3.html
index 5104b7b0..333ef320 100644
--- a/pelican/tests/output/custom_locale/author/alexis-metaireau3.html
+++ b/pelican/tests/output/custom_locale/author/alexis-metaireau3.html
@@ -39,7 +39,7 @@
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2010-10-15T20:30:00">
+        <abbr class="published" title="2010-10-15T20:30:00+02:00">
                 Published: 15 octobre 2010
         </abbr>
 
@@ -72,7 +72,7 @@ pelican.conf, it ...</p></div>
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2010-03-14T00:00:00">
+        <abbr class="published" title="2010-03-14T00:00:00+01:00">
                 Published: 14 mars 2010
         </abbr>
 
diff --git a/pelican/tests/output/custom_locale/category/bar.html b/pelican/tests/output/custom_locale/category/bar.html
index c693d3f5..fc11f06e 100644
--- a/pelican/tests/output/custom_locale/category/bar.html
+++ b/pelican/tests/output/custom_locale/category/bar.html
@@ -33,7 +33,7 @@
                 <article>
                     <h1 class="entry-title"><a href="../posts/2010/octobre/20/oh-yeah/">Oh yeah !</a></h1>
 <footer class="post-info">
-        <abbr class="published" title="2010-10-20T10:14:00">
+        <abbr class="published" title="2010-10-20T10:14:00+02:00">
                 Published: 20 octobre 2010
         </abbr>
 
diff --git a/pelican/tests/output/custom_locale/category/cat1.html b/pelican/tests/output/custom_locale/category/cat1.html
index c332f817..e1556d9e 100644
--- a/pelican/tests/output/custom_locale/category/cat1.html
+++ b/pelican/tests/output/custom_locale/category/cat1.html
@@ -33,7 +33,7 @@
                 <article>
                     <h1 class="entry-title"><a href="../posts/2011/avril/20/a-markdown-powered-article/">A markdown powered article</a></h1>
 <footer class="post-info">
-        <abbr class="published" title="2011-04-20T00:00:00">
+        <abbr class="published" title="2011-04-20T00:00:00+02:00">
                 Published: 20 avril 2011
         </abbr>
 
@@ -59,7 +59,7 @@
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2011-02-17T00:00:00">
+        <abbr class="published" title="2011-02-17T00:00:00+01:00">
                 Published: 17 février 2011
         </abbr>
 
@@ -82,7 +82,7 @@
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2011-02-17T00:00:00">
+        <abbr class="published" title="2011-02-17T00:00:00+01:00">
                 Published: 17 février 2011
         </abbr>
 
@@ -105,7 +105,7 @@
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2011-02-17T00:00:00">
+        <abbr class="published" title="2011-02-17T00:00:00+01:00">
                 Published: 17 février 2011
         </abbr>
 
diff --git a/pelican/tests/output/custom_locale/category/misc.html b/pelican/tests/output/custom_locale/category/misc.html
index 02562525..3ff2f8e4 100644
--- a/pelican/tests/output/custom_locale/category/misc.html
+++ b/pelican/tests/output/custom_locale/category/misc.html
@@ -33,7 +33,7 @@
                 <article>
                     <h1 class="entry-title"><a href="../posts/2012/novembre/30/filename_metadata-example/">FILENAME_METADATA example</a></h1>
 <footer class="post-info">
-        <abbr class="published" title="2012-11-30T00:00:00">
+        <abbr class="published" title="2012-11-30T00:00:00+01:00">
                 Published: 30 novembre 2012
         </abbr>
 
@@ -58,7 +58,7 @@
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2012-02-29T00:00:00">
+        <abbr class="published" title="2012-02-29T00:00:00+01:00">
                 Published: 29 février 2012
         </abbr>
 
@@ -83,7 +83,7 @@
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2010-10-15T20:30:00">
+        <abbr class="published" title="2010-10-15T20:30:00+02:00">
                 Published: 15 octobre 2010
         </abbr>
 
@@ -116,7 +116,7 @@ pelican.conf, it ...</p></div>
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2010-03-14T00:00:00">
+        <abbr class="published" title="2010-03-14T00:00:00+01:00">
                 Published: 14 mars 2010
         </abbr>
 
diff --git a/pelican/tests/output/custom_locale/category/yeah.html b/pelican/tests/output/custom_locale/category/yeah.html
index 6427095b..7ee2bbe9 100644
--- a/pelican/tests/output/custom_locale/category/yeah.html
+++ b/pelican/tests/output/custom_locale/category/yeah.html
@@ -33,11 +33,11 @@
                 <article>
                     <h1 class="entry-title"><a href="../posts/2010/décembre/02/this-is-a-super-article/">This is a super article !</a></h1>
 <footer class="post-info">
-        <abbr class="published" title="2010-12-02T10:14:00">
+        <abbr class="published" title="2010-12-02T10:14:00+01:00">
                 Published: 02 décembre 2010
         </abbr>
 		<br />
-        <abbr class="modified" title="2013-11-17T23:29:00">
+        <abbr class="modified" title="2013-11-17T23:29:00+01:00">
                 Updated: 17 novembre 2013
         </abbr>
 
@@ -106,4 +106,4 @@
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom_locale/drafts/a-draft-article.html b/pelican/tests/output/custom_locale/drafts/a-draft-article.html
index 16ff22cd..a33e6797 100644
--- a/pelican/tests/output/custom_locale/drafts/a-draft-article.html
+++ b/pelican/tests/output/custom_locale/drafts/a-draft-article.html
@@ -38,7 +38,7 @@
 
     <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2012-03-02T14:01:01">
+        <abbr class="published" title="2012-03-02T14:01:01+01:00">
                 Published: 02 mars 2012
         </abbr>
 
diff --git a/pelican/tests/output/custom_locale/index.html b/pelican/tests/output/custom_locale/index.html
index 5898c5b5..d64bea7d 100644
--- a/pelican/tests/output/custom_locale/index.html
+++ b/pelican/tests/output/custom_locale/index.html
@@ -33,7 +33,7 @@
                 <article>
                     <h1 class="entry-title"><a href="./posts/2012/novembre/30/filename_metadata-example/">FILENAME_METADATA example</a></h1>
 <footer class="post-info">
-        <abbr class="published" title="2012-11-30T00:00:00">
+        <abbr class="published" title="2012-11-30T00:00:00+01:00">
                 Published: 30 novembre 2012
         </abbr>
 
@@ -58,7 +58,7 @@
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2012-02-29T00:00:00">
+        <abbr class="published" title="2012-02-29T00:00:00+01:00">
                 Published: 29 février 2012
         </abbr>
 
@@ -83,7 +83,7 @@
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2011-04-20T00:00:00">
+        <abbr class="published" title="2011-04-20T00:00:00+02:00">
                 Published: 20 avril 2011
         </abbr>
 
@@ -107,7 +107,7 @@
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2011-02-17T00:00:00">
+        <abbr class="published" title="2011-02-17T00:00:00+01:00">
                 Published: 17 février 2011
         </abbr>
 
diff --git a/pelican/tests/output/custom_locale/index2.html b/pelican/tests/output/custom_locale/index2.html
index f1ed6b46..3b3d2d52 100644
--- a/pelican/tests/output/custom_locale/index2.html
+++ b/pelican/tests/output/custom_locale/index2.html
@@ -39,7 +39,7 @@
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2011-02-17T00:00:00">
+        <abbr class="published" title="2011-02-17T00:00:00+01:00">
                 Published: 17 février 2011
         </abbr>
 
@@ -62,7 +62,7 @@
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2011-02-17T00:00:00">
+        <abbr class="published" title="2011-02-17T00:00:00+01:00">
                 Published: 17 février 2011
         </abbr>
 
@@ -85,11 +85,11 @@
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2010-12-02T10:14:00">
+        <abbr class="published" title="2010-12-02T10:14:00+01:00">
                 Published: 02 décembre 2010
         </abbr>
 		<br />
-        <abbr class="modified" title="2013-11-17T23:29:00">
+        <abbr class="modified" title="2013-11-17T23:29:00+01:00">
                 Updated: 17 novembre 2013
         </abbr>
 
@@ -113,7 +113,7 @@ as well as <strong>inline markup</strong>.</p>
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2010-10-20T10:14:00">
+        <abbr class="published" title="2010-10-20T10:14:00+02:00">
                 Published: 20 octobre 2010
         </abbr>
 
@@ -184,4 +184,4 @@ YEAH !</p>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom_locale/index3.html b/pelican/tests/output/custom_locale/index3.html
index 7f7a905f..96d70261 100644
--- a/pelican/tests/output/custom_locale/index3.html
+++ b/pelican/tests/output/custom_locale/index3.html
@@ -39,7 +39,7 @@
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2010-10-15T20:30:00">
+        <abbr class="published" title="2010-10-15T20:30:00+02:00">
                 Published: 15 octobre 2010
         </abbr>
 
@@ -72,7 +72,7 @@ pelican.conf, it ...</p></div>
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2010-03-14T00:00:00">
+        <abbr class="published" title="2010-03-14T00:00:00+01:00">
                 Published: 14 mars 2010
         </abbr>
 
diff --git a/pelican/tests/output/custom_locale/oh-yeah-fr.html b/pelican/tests/output/custom_locale/oh-yeah-fr.html
index 72c8b62d..77d9e2c5 100644
--- a/pelican/tests/output/custom_locale/oh-yeah-fr.html
+++ b/pelican/tests/output/custom_locale/oh-yeah-fr.html
@@ -38,7 +38,7 @@
 
     <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2012-03-02T14:01:01">
+        <abbr class="published" title="2012-03-02T14:01:01+01:00">
                 Published: 02 mars 2012
         </abbr>
 
diff --git a/pelican/tests/output/custom_locale/posts/2010/décembre/02/this-is-a-super-article/index.html b/pelican/tests/output/custom_locale/posts/2010/décembre/02/this-is-a-super-article/index.html
index 0dd0e3da..b2ffdf9c 100644
--- a/pelican/tests/output/custom_locale/posts/2010/décembre/02/this-is-a-super-article/index.html
+++ b/pelican/tests/output/custom_locale/posts/2010/décembre/02/this-is-a-super-article/index.html
@@ -38,11 +38,11 @@
 
     <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2010-12-02T10:14:00">
+        <abbr class="published" title="2010-12-02T10:14:00+01:00">
                 Published: 02 décembre 2010
         </abbr>
 		<br />
-        <abbr class="modified" title="2013-11-17T23:29:00">
+        <abbr class="modified" title="2013-11-17T23:29:00+01:00">
                 Updated: 17 novembre 2013
         </abbr>
 
@@ -126,4 +126,4 @@
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html b/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html
index 6cdb4bb1..d7449ebf 100644
--- a/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html
+++ b/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html
@@ -38,7 +38,7 @@
 
     <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2010-10-15T20:30:00">
+        <abbr class="published" title="2010-10-15T20:30:00+02:00">
                 Published: 15 octobre 2010
         </abbr>
 
diff --git a/pelican/tests/output/custom_locale/posts/2010/octobre/20/oh-yeah/index.html b/pelican/tests/output/custom_locale/posts/2010/octobre/20/oh-yeah/index.html
index 233df239..12c67404 100644
--- a/pelican/tests/output/custom_locale/posts/2010/octobre/20/oh-yeah/index.html
+++ b/pelican/tests/output/custom_locale/posts/2010/octobre/20/oh-yeah/index.html
@@ -38,7 +38,7 @@
 
     <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2010-10-20T10:14:00">
+        <abbr class="published" title="2010-10-20T10:14:00+02:00">
                 Published: 20 octobre 2010
         </abbr>
 
diff --git a/pelican/tests/output/custom_locale/posts/2011/avril/20/a-markdown-powered-article/index.html b/pelican/tests/output/custom_locale/posts/2011/avril/20/a-markdown-powered-article/index.html
index aa4d254f..81bb6fa6 100644
--- a/pelican/tests/output/custom_locale/posts/2011/avril/20/a-markdown-powered-article/index.html
+++ b/pelican/tests/output/custom_locale/posts/2011/avril/20/a-markdown-powered-article/index.html
@@ -38,7 +38,7 @@
 
     <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2011-04-20T00:00:00">
+        <abbr class="published" title="2011-04-20T00:00:00+02:00">
                 Published: 20 avril 2011
         </abbr>
 
diff --git a/pelican/tests/output/custom_locale/posts/2011/février/17/article-1/index.html b/pelican/tests/output/custom_locale/posts/2011/février/17/article-1/index.html
index e9c86a97..8aa9de4a 100644
--- a/pelican/tests/output/custom_locale/posts/2011/février/17/article-1/index.html
+++ b/pelican/tests/output/custom_locale/posts/2011/février/17/article-1/index.html
@@ -38,7 +38,7 @@
 
     <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2011-02-17T00:00:00">
+        <abbr class="published" title="2011-02-17T00:00:00+01:00">
                 Published: 17 février 2011
         </abbr>
 
diff --git a/pelican/tests/output/custom_locale/posts/2011/février/17/article-2/index.html b/pelican/tests/output/custom_locale/posts/2011/février/17/article-2/index.html
index 8724d7c2..1d78ade5 100644
--- a/pelican/tests/output/custom_locale/posts/2011/février/17/article-2/index.html
+++ b/pelican/tests/output/custom_locale/posts/2011/février/17/article-2/index.html
@@ -38,7 +38,7 @@
 
     <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2011-02-17T00:00:00">
+        <abbr class="published" title="2011-02-17T00:00:00+01:00">
                 Published: 17 février 2011
         </abbr>
 
diff --git a/pelican/tests/output/custom_locale/posts/2011/février/17/article-3/index.html b/pelican/tests/output/custom_locale/posts/2011/février/17/article-3/index.html
index c14b537d..372090cc 100644
--- a/pelican/tests/output/custom_locale/posts/2011/février/17/article-3/index.html
+++ b/pelican/tests/output/custom_locale/posts/2011/février/17/article-3/index.html
@@ -38,7 +38,7 @@
 
     <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2011-02-17T00:00:00">
+        <abbr class="published" title="2011-02-17T00:00:00+01:00">
                 Published: 17 février 2011
         </abbr>
 
diff --git a/pelican/tests/output/custom_locale/posts/2012/février/29/second-article/index.html b/pelican/tests/output/custom_locale/posts/2012/février/29/second-article/index.html
index 598bf797..812fdfd0 100644
--- a/pelican/tests/output/custom_locale/posts/2012/février/29/second-article/index.html
+++ b/pelican/tests/output/custom_locale/posts/2012/février/29/second-article/index.html
@@ -38,7 +38,7 @@
 
     <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2012-02-29T00:00:00">
+        <abbr class="published" title="2012-02-29T00:00:00+01:00">
                 Published: 29 février 2012
         </abbr>
 
diff --git a/pelican/tests/output/custom_locale/posts/2012/novembre/30/filename_metadata-example/index.html b/pelican/tests/output/custom_locale/posts/2012/novembre/30/filename_metadata-example/index.html
index 66339175..de426279 100644
--- a/pelican/tests/output/custom_locale/posts/2012/novembre/30/filename_metadata-example/index.html
+++ b/pelican/tests/output/custom_locale/posts/2012/novembre/30/filename_metadata-example/index.html
@@ -38,7 +38,7 @@
 
     <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2012-11-30T00:00:00">
+        <abbr class="published" title="2012-11-30T00:00:00+01:00">
                 Published: 30 novembre 2012
         </abbr>
 
diff --git a/pelican/tests/output/custom_locale/second-article-fr.html b/pelican/tests/output/custom_locale/second-article-fr.html
index eb2225d9..07a2a09c 100644
--- a/pelican/tests/output/custom_locale/second-article-fr.html
+++ b/pelican/tests/output/custom_locale/second-article-fr.html
@@ -38,7 +38,7 @@
 
     <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2012-02-29T00:00:00">
+        <abbr class="published" title="2012-02-29T00:00:00+01:00">
                 Published: 29 février 2012
         </abbr>
 
diff --git a/pelican/tests/output/custom_locale/tag/bar.html b/pelican/tests/output/custom_locale/tag/bar.html
index a8e3bd7a..911f53af 100644
--- a/pelican/tests/output/custom_locale/tag/bar.html
+++ b/pelican/tests/output/custom_locale/tag/bar.html
@@ -33,7 +33,7 @@
                 <article>
                     <h1 class="entry-title"><a href="../posts/2012/février/29/second-article/">Second article</a></h1>
 <footer class="post-info">
-        <abbr class="published" title="2012-02-29T00:00:00">
+        <abbr class="published" title="2012-02-29T00:00:00+01:00">
                 Published: 29 février 2012
         </abbr>
 
@@ -60,11 +60,11 @@
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2010-12-02T10:14:00">
+        <abbr class="published" title="2010-12-02T10:14:00+01:00">
                 Published: 02 décembre 2010
         </abbr>
 		<br />
-        <abbr class="modified" title="2013-11-17T23:29:00">
+        <abbr class="modified" title="2013-11-17T23:29:00+01:00">
                 Updated: 17 novembre 2013
         </abbr>
 
@@ -88,7 +88,7 @@ as well as <strong>inline markup</strong>.</p>
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2010-10-20T10:14:00">
+        <abbr class="published" title="2010-10-20T10:14:00+02:00">
                 Published: 20 octobre 2010
         </abbr>
 
@@ -157,4 +157,4 @@ YEAH !</p>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom_locale/tag/baz.html b/pelican/tests/output/custom_locale/tag/baz.html
index 77e09faf..1cea44d1 100644
--- a/pelican/tests/output/custom_locale/tag/baz.html
+++ b/pelican/tests/output/custom_locale/tag/baz.html
@@ -38,7 +38,7 @@
 
     <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2010-03-14T00:00:00">
+        <abbr class="published" title="2010-03-14T00:00:00+01:00">
                 Published: 14 mars 2010
         </abbr>
 
diff --git a/pelican/tests/output/custom_locale/tag/foo.html b/pelican/tests/output/custom_locale/tag/foo.html
index 3c238811..01bb8b17 100644
--- a/pelican/tests/output/custom_locale/tag/foo.html
+++ b/pelican/tests/output/custom_locale/tag/foo.html
@@ -33,7 +33,7 @@
                 <article>
                     <h1 class="entry-title"><a href="../posts/2012/février/29/second-article/">Second article</a></h1>
 <footer class="post-info">
-        <abbr class="published" title="2012-02-29T00:00:00">
+        <abbr class="published" title="2012-02-29T00:00:00+01:00">
                 Published: 29 février 2012
         </abbr>
 
@@ -60,11 +60,11 @@
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2010-12-02T10:14:00">
+        <abbr class="published" title="2010-12-02T10:14:00+01:00">
                 Published: 02 décembre 2010
         </abbr>
 		<br />
-        <abbr class="modified" title="2013-11-17T23:29:00">
+        <abbr class="modified" title="2013-11-17T23:29:00+01:00">
                 Updated: 17 novembre 2013
         </abbr>
 
@@ -127,4 +127,4 @@ as well as <strong>inline markup</strong>.</p>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom_locale/tag/foobar.html b/pelican/tests/output/custom_locale/tag/foobar.html
index e30c4906..85b2b0ed 100644
--- a/pelican/tests/output/custom_locale/tag/foobar.html
+++ b/pelican/tests/output/custom_locale/tag/foobar.html
@@ -33,11 +33,11 @@
                 <article>
                     <h1 class="entry-title"><a href="../posts/2010/décembre/02/this-is-a-super-article/">This is a super article !</a></h1>
 <footer class="post-info">
-        <abbr class="published" title="2010-12-02T10:14:00">
+        <abbr class="published" title="2010-12-02T10:14:00+01:00">
                 Published: 02 décembre 2010
         </abbr>
 		<br />
-        <abbr class="modified" title="2013-11-17T23:29:00">
+        <abbr class="modified" title="2013-11-17T23:29:00+01:00">
                 Updated: 17 novembre 2013
         </abbr>
 
@@ -106,4 +106,4 @@
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom_locale/tag/yeah.html b/pelican/tests/output/custom_locale/tag/yeah.html
index 6754ecf6..45789e86 100644
--- a/pelican/tests/output/custom_locale/tag/yeah.html
+++ b/pelican/tests/output/custom_locale/tag/yeah.html
@@ -33,7 +33,7 @@
                 <article>
                     <h1 class="entry-title"><a href="../posts/2010/octobre/20/oh-yeah/">Oh yeah !</a></h1>
 <footer class="post-info">
-        <abbr class="published" title="2010-10-20T10:14:00">
+        <abbr class="published" title="2010-10-20T10:14:00+02:00">
                 Published: 20 octobre 2010
         </abbr>
 
diff --git a/pelican/tests/test_utils.py b/pelican/tests/test_utils.py
index df1918b5..d77b367b 100644
--- a/pelican/tests/test_utils.py
+++ b/pelican/tests/test_utils.py
@@ -263,6 +263,9 @@ class TestUtils(LoggedTestCase):
         self.assertEqual(utils.strftime(d, '%d/%m/%y'), '29/08/12')
         self.assertEqual(utils.strftime(d, '%d/%m/%Y'), '29/08/2012')
 
+        # RFC 3339
+        self.assertEqual(utils.strftime(d, '%Y-%m-%dT%H:%M:%SZ'),'2012-08-29T00:00:00Z')
+
         # % escaped
         self.assertEqual(utils.strftime(d, '%d%%%m%%%y'), '29%08%12')
         self.assertEqual(utils.strftime(d, '%d %% %m %% %y'), '29 % 08 % 12')
diff --git a/pelican/utils.py b/pelican/utils.py
index 5e4822ba..31ab5489 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -538,7 +538,9 @@ def set_date_tzinfo(d, tz_name=None):
     """Set the timezone for dates that don't have tzinfo"""
     if tz_name and not d.tzinfo:
         tz = pytz.timezone(tz_name)
-        return tz.localize(d)
+        d = tz.localize(d)
+        return SafeDatetime(d.year, d.month, d.day, d.hour, d.minute, d.second,
+                            d.microsecond, d.tzinfo)
     return d