Merge master into "3.0"

Conflicts:
	.travis.yml
	CHANGELOG.md
	core/Plugin/ControllerAdmin.php
	core/Version.php
	core/testMinimumPhpVersion.php
	plugins/API/API.php
	plugins/Actions/Reports/GetPageUrls.php
	plugins/AnonymousPiwikUsageMeasurement
	plugins/CoreHome/CoreHome.php
	plugins/CoreHome/templates/_menu.twig
	plugins/CoreVisualizations/javascripts/jqplotEvolutionGraph.js
	plugins/CustomVariables/tests/System/expected/test_CustomVariablesSystemTest__CustomVariables.getCustomVariables_day.xml
	plugins/Goals/Controller.php
	tests/PHPUnit/Fixtures/ManyVisitsWithGeoIP.php
	tests/PHPUnit/Integration/Plugin/ManagerTest.php
	tests/PHPUnit/System/expected/test_FlattenReports__CustomVariables.getCustomVariables_day.xml
	tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html
	tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml
	tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html
	tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__CustomVariables.getCustomVariables_range.xml
	tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__CustomVariables.getCustomVariables_range.xml
	tests/PHPUnit/System/expected/test_reportLimiting__CustomVariables.getCustomVariables_day.xml
	tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__CustomVariables.getCustomVariables_day.xml
	tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__CustomVariables.getCustomVariables_day.xml
	tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__CustomVariables.getCustomVariables_week.xml
	tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__CustomVariables.getCustomVariables_day.xml
	tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__CustomVariables.getCustomVariables_week.xml
	tests/UI/expected-ui-screenshots
	tests/UI/specs/Overlay_spec.js
	tests/UI/specs/UIIntegration_spec.js

2 files changed, 3 insertions, 0 deletions

diff --git a/plugins/Provider/lang/ja.json b/plugins/Provider/lang/ja.json
index 8f34448bfc..4ac0948932 100644
--- a/plugins/Provider/lang/ja.json
+++ b/plugins/Provider/lang/ja.json
@@ -1,6 +1,7 @@
 {
     "Provider": {
         "ColumnProvider": "プロバイダ",
+        "PluginDescription": "ビジターのインターネットサービスプロバイダを報告します",
         "ProviderReportDocumentation": "このリポートは、ウェブサイトにアクセスするビジターが使っているインターネットサービスプロバイダを示しています。詳細については、プロバイダ名をクリックしてください。 %s Piwik がビジターのプロバイダを判別できない場合は、IPとして表示されます。",
         "WidgetProviders": "プロバイダ",
         "ProviderReportFooter": "未知のプロバイダーとは IP アドレスが検索できなかったことを意味します。"
diff --git a/plugins/Provider/lang/sl.json b/plugins/Provider/lang/sl.json
index c13e93cdc9..8f5a09e046 100644
--- a/plugins/Provider/lang/sl.json
+++ b/plugins/Provider/lang/sl.json
@@ -1,6 +1,8 @@
 {
     "Provider": {
         "ColumnProvider": "Ponudnik",
+        "PluginDescription": "Poročilo o obiskovalčevem ponudniku dostopa do internetnih storitev.",
+        "ProviderReportDocumentation": "To poročilo prikazuje ponudnike dostopa do internetnih storitve prek katerih so obiskovalci dostopali do vaše spletne strani. Za podrobnosti lahko kliknete na ime posameznega ponudnika. %s Če Piwik ne more določiti obiskovalčevega ponudnika, je le-ta naveden kot IP naslov.",
         "WidgetProviders": "Ponudniki",
         "ProviderReportFooter": "Neznan ponudnik pomeni, da IP številke ni bilo mogoče povezati s ponudnikom."
     }