diff --git a/README.md b/README.md
index 8c12c5a0636..b6268294986 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,8 @@
 # Piwik - piwik.org   
 
-## We’re seeking a talented open source Software Engineer!
+## We’re seeking a talented Software Engineer
 
-Are you looking for a new challenge? We are currently seeking a software engineer or software developer who is passionate about data processing, security, privacy, the open source philosophy and usable interface design.
+Are you looking for a new challenge? We are currently seeking a software engineer or software developer who is passionate about data processing, security, privacy, the open source and free/libre philosophy and usable interface design.
 
 [View Job Description](http://piwik.org/blog/2014/05/piwik-expanding-seeking-talented-software-engineer-new-zealand-poland/) - [Apply online](http://piwik.org/jobs/)
 
diff --git a/composer.json b/composer.json
index 0cfa4c9f062..de87087718e 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "piwik/piwik",
     "type": "application",
-    "description": "Open Source Real Time Web Analytics Platform",
+    "description": "the leading free/libre analytics platform",
     "keywords": ["piwik","web","analytics"],
     "homepage": "http://piwik.org",
     "license": "GPL-3.0+",
diff --git a/plugins/CustomAlerts b/plugins/CustomAlerts
index 495cf80c13b..defaa73836a 160000
--- a/plugins/CustomAlerts
+++ b/plugins/CustomAlerts
@@ -1 +1 @@
-Subproject commit 495cf80c13b16ef80f9871d31d859abd955540bb
+Subproject commit defaa73836af7da37bff85c74de336ff6b1edcdd
diff --git a/plugins/ExampleAPI/API.php b/plugins/ExampleAPI/API.php
index 19a446d17a2..27dc2f59aaf 100644
--- a/plugins/ExampleAPI/API.php
+++ b/plugins/ExampleAPI/API.php
@@ -87,7 +87,7 @@ public function getNull()
      */
     public function getDescriptionArray()
     {
-        return array('piwik', 'open source', 'web analytics', 'free', 'Strong message: Свободный Тибет');
+        return array('piwik', 'free/libre', 'web analytics', 'free', 'Strong message: Свободный Тибет');
     }
 
     /**
diff --git a/plugins/SecurityInfo b/plugins/SecurityInfo
index e3db81b6e55..bc73711df83 160000
--- a/plugins/SecurityInfo
+++ b/plugins/SecurityInfo
@@ -1 +1 @@
-Subproject commit e3db81b6e557f9ca6b9ace64be505f9dd1a9a7c9
+Subproject commit bc73711df837a1cda2de8d8634b9c4e13997b1e4
diff --git a/plugins/TasksTimetable b/plugins/TasksTimetable
index a98ff9e692c..8abb4ee4c2d 160000
--- a/plugins/TasksTimetable
+++ b/plugins/TasksTimetable
@@ -1 +1 @@
-Subproject commit a98ff9e692c3bda601cb269673897decce39a4f3
+Subproject commit 8abb4ee4c2dd3ccd6e16667a51e0d2ac26af66a7
diff --git a/plugins/TreemapVisualization b/plugins/TreemapVisualization
index b54a6601a52..2a064c773c8 160000
--- a/plugins/TreemapVisualization
+++ b/plugins/TreemapVisualization
@@ -1 +1 @@
-Subproject commit b54a6601a52071198b8560335869b57d91452431
+Subproject commit 2a064c773c8eef17655f5d2ddb626294c1ee029f
diff --git a/plugins/VisitorGenerator b/plugins/VisitorGenerator
index 240f1deff36..17e3ebd3efa 160000
--- a/plugins/VisitorGenerator
+++ b/plugins/VisitorGenerator
@@ -1 +1 @@
-Subproject commit 240f1deff367ef1c19d065f259311865db7e161a
+Subproject commit 17e3ebd3efab0bb489b0621cb45b88f693a71f6b
diff --git a/tests/PHPUnit/Fixtures/InvalidVisits.php b/tests/PHPUnit/Fixtures/InvalidVisits.php
index 8d849b31b1b..75015a07669 100644
--- a/tests/PHPUnit/Fixtures/InvalidVisits.php
+++ b/tests/PHPUnit/Fixtures/InvalidVisits.php
@@ -52,7 +52,7 @@ private function trackVisits()
         // Trigger empty request
         $trackerUrl = self::getTrackerUrl();
         $response = Http::fetchRemoteFile($trackerUrl);
-        self::assertTrue(strpos($response, 'is a free open source web') !== false, 'Piwik empty request response not correct: ' . $response);
+        self::assertTrue(strpos($response, 'is a free/libre web') !== false, 'Piwik empty request response not correct: ' . $response);
 
         $t = self::getTracker($idSite, $dateTime, $defaultInit = true);