Merge branch 'master' into 3.0

Conflicts:
	core/Version.php
	plugins/Actions/Menu.php
	plugins/CoreHome/angularjs/history/history.service.js
	plugins/CoreHome/javascripts/menu.js
	plugins/CoreHome/templates/_menu.twig
	plugins/Dashboard/Menu.php
	plugins/Ecommerce/Menu.php
	plugins/ExampleUI/Menu.php
	plugins/Goals/Menu.php
	plugins/Referrers/Menu.php
	plugins/VisitsSummary/Menu.php
	tests/UI/expected-ui-screenshots
	tests/UI/specs/UIIntegration_spec.js

1 files changed, 5 insertions, 1 deletions

diff --git a/plugins/CoreConsole/Commands/GenerateUpdate.php b/plugins/CoreConsole/Commands/GenerateUpdate.php
index a9d843d04d..8fc91fd50c 100644
--- a/plugins/CoreConsole/Commands/GenerateUpdate.php
+++ b/plugins/CoreConsole/Commands/GenerateUpdate.php
@@ -34,7 +34,7 @@ class GenerateUpdate extends GeneratePluginBase
         $className = $this->getUpdateClassName($component, $version);
 
         $exampleFolder = PIWIK_INCLUDE_PATH . '/plugins/ExamplePlugin';
-        $replace       = array('Piwik\Plugins\ExamplePlugin' => $namespace,
+        $replace       = array('Piwik\Plugins\ExamplePlugin\Updates' => $namespace,
                                'ExamplePlugin' => $component,
                                'Updates_0_0_2' => $className,
                                '0.0.2'         => $version);
@@ -82,6 +82,10 @@ class GenerateUpdate extends GeneratePluginBase
         $className = str_replace('Updates_xx', '', $className);
         $className = trim($className, '\\');
 
+        if ($component !== 'core') {
+            $className .= '\Updates';
+        }
+
         return $className;
     }