Merge branch 'master' into 3.0

Conflicts:
	core/Version.php
	plugins/CoreHome/javascripts/menu.js
	plugins/Events/Reports/GetActionFromCategoryId.php
	plugins/Events/Reports/GetActionFromNameId.php
	plugins/Events/Reports/GetCategoryFromActionId.php
	plugins/Events/Reports/GetCategoryFromNameId.php
	plugins/Events/Reports/GetNameFromActionId.php
	plugins/Events/Reports/GetNameFromCategoryId.php
	tests/UI/expected-ui-screenshots

1 files changed, 4 insertions, 1 deletions

diff --git a/plugins/Events/Events.php b/plugins/Events/Events.php
index f09e1a9925..d18bb32f05 100644
--- a/plugins/Events/Events.php
+++ b/plugins/Events/Events.php
@@ -198,13 +198,16 @@ class Events extends \Piwik\Plugin
 
     }
 
-    private function addTooltipEventValue($view)
+    private function addTooltipEventValue(ViewDataTable $view)
     {
         // Creates the tooltip message for Event Value column
         $tooltipCallback = function ($hits, $min, $max, $avg) {
             if (!$hits) {
                 return false;
             }
+
+            $avg = $avg ?: 0;
+
             $msgEventMinMax = Piwik::translate("Events_EventValueTooltip", array($hits, "<br />", $min, $max));
             $msgEventAvg = Piwik::translate("Events_AvgEventValue", $avg);
             return $msgEventMinMax . "<br/>" . $msgEventAvg;