Merge branch 'master' into processed_metrics_metadata

Conflicts:
	core/Twig.php

1 files changed, 1 insertions, 2 deletions

diff --git a/core/Twig.php b/core/Twig.php
index 790de9ab3c..806c7f433f 100755
--- a/core/Twig.php
+++ b/core/Twig.php
@@ -11,7 +11,6 @@ namespace Piwik;
 use Exception;
 use Piwik\DataTable\Filter\SafeDecodeLabel;
 use Piwik\Metrics\Formatter;
-use Piwik\Period\Range;
 use Piwik\Translate;
 use Piwik\View\RenderTokenParser;
 use Piwik\Visualization\Sparkline;
@@ -250,7 +249,7 @@ class Twig
     protected function addFilter_prettyDate()
     {
         $prettyDate = new Twig_SimpleFilter('prettyDate', function ($dateString, $period) {
-            return Range::factory($period, $dateString)->getLocalizedShortString();
+            return Period\Factory::build($period, $dateString)->getLocalizedShortString();
         });
         $this->twig->addFilter($prettyDate);
     }