Merge remote-tracking branch 'origin/master' into deprecate_usersettings

Conflicts:
	composer.lock
	core/Version.php
	tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml
	tests/PHPUnit/Integration/expected/test_csvExport__Live.getLastVisitsDetails_day.csv

1 files changed, 1 insertions, 1 deletions

diff --git a/core/Version.php b/core/Version.php
index 94c6da9cb7..cf2377419e 100644
--- a/core/Version.php
+++ b/core/Version.php
@@ -21,5 +21,5 @@ final class Version
      * The current Piwik version.
      * @var string
      */
-    const VERSION = '2.8.0-b1';
+    const VERSION = '2.9.0-b1';
 }