diff --git a/.travis.yml b/.travis.yml
index 697996c13..1bcd8421a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,7 +23,7 @@ branches:
     - 'develop'
 
 before_install:
-  - gem install bundler --version 1.12.5
+  - gem install bundler
   - mkdir travis-phantomjs
   - wget http://cifiles.diasporafoundation.org/phantomjs-2.1.1-linux-x86_64.tar.bz2 -O $PWD/travis-phantomjs/phantomjs-2.1.1-linux-x86_64.tar.bz2
   - tar -xvf $PWD/travis-phantomjs/phantomjs-2.1.1-linux-x86_64.tar.bz2 -C $PWD/travis-phantomjs
diff --git a/Changelog.md b/Changelog.md
index 5493395b5..8271a41fd 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,11 @@
+# 0.7.0.0
+
+## Refactor
+
+## Bug fixes
+
+## Features
+
 # 0.6.1.0
 
 ## Refactor
diff --git a/config/defaults.yml b/config/defaults.yml
index 2c9046f6a..8fc69122d 100644
--- a/config/defaults.yml
+++ b/config/defaults.yml
@@ -4,7 +4,7 @@
 
 defaults:
   version:
-    number: "0.6.0.99" # Do not touch unless doing a release, do not backport the version number that's in master
+    number: "0.6.99.0" # Do not touch unless doing a release, do not backport the version number that's in master
   heroku: false
   environment:
     url: "http://localhost:3000/"
diff --git a/script/ci/build.sh b/script/ci/build.sh
index d07e45c8e..7a129f211 100755
--- a/script/ci/build.sh
+++ b/script/ci/build.sh
@@ -8,6 +8,6 @@ if [ "$DB" = "mysql" ]; then
   sed -i 's/*common/*mysql/' config/database.yml
 fi
 
-command="bundle _1.12.5_ exec rake --trace ci:travis:${BUILD_TYPE}"
+command="bundle exec rake --trace ci:travis:${BUILD_TYPE}"
 
 exec xvfb-run --auto-servernum --server-num=1 --server-args="-screen 0 1280x1024x8" $command