From 4651fd222fab77cab6f0badf070b1776807c1418 Mon Sep 17 00:00:00 2001
From: Leonid Makarov <leonid.makarov@ffwagency.com>
Date: Wed, 3 Aug 2016 16:45:13 -0700
Subject: [PATCH 1/4] VirtualBox version compatibiltiy

Updated version compatibility in README
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index c8baa79..828b49d 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ The stock boot2docker/docker-machine mounts host volumes via VirtualBox Guest Ad
 
 <a name="requirements"></a>
 ## Prerequisites
-1. [VirtualBox](https://www.virtualbox.org/) 5.0+
+1. [VirtualBox](https://www.virtualbox.org/) 5.0.x
 2. [Vagrant](https://www.vagrantup.com/) 1.7.3+
 3. [Babun](http://babun.github.io) - A Linux-type shell, **Windows only**
 

From 2fc8838159e35ac81eab1e808eb8100386f071a4 Mon Sep 17 00:00:00 2001
From: Leonid Makarov <leonid.makarov@ffwagency.com>
Date: Fri, 26 Aug 2016 14:57:01 -0700
Subject: [PATCH 2/4] Version updates

Now supporting/requiring VirtualBox v5.1.x and Vagrant v1.8.5+
---
 Vagrantfile             | 4 ++--
 scripts/presetup-mac.sh | 4 ++--
 scripts/presetup-win.sh | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index e7ba124..800a257 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -93,13 +93,13 @@ end
 ######################################################################
 
 # Vagrant Box Configuration #
-Vagrant.require_version ">= 1.7.3"
+Vagrant.require_version ">= 1.8.5"
 
 Vagrant.configure("2") do |config|
   config.vm.define "boot2docker"
 
   config.vm.box = "blinkreaction/boot2docker"
-  config.vm.box_version = "1.11.2"
+  config.vm.box_version = "1.12.1"
   config.vm.box_check_update = true
 
   ## Network ##
diff --git a/scripts/presetup-mac.sh b/scripts/presetup-mac.sh
index 9002ee7..55b45f5 100755
--- a/scripts/presetup-mac.sh
+++ b/scripts/presetup-mac.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-DOCKER_VERSION=1.11.2
-DOCKER_COMPOSE_VERSION=1.7.1
+DOCKER_VERSION=1.12.1
+DOCKER_COMPOSE_VERSION=1.8.0
 
 # Console colors
 red='\033[0;31m'
diff --git a/scripts/presetup-win.sh b/scripts/presetup-win.sh
index 7dc96fb..70f6acd 100644
--- a/scripts/presetup-win.sh
+++ b/scripts/presetup-win.sh
@@ -1,10 +1,10 @@
 #!/bin/bash
 
-DOCKER_VERSION=1.11.2
-DOCKER_COMPOSE_VERSION=1.7.1
+DOCKER_VERSION=1.12.1
+DOCKER_COMPOSE_VERSION=1.8.0
 # These two shouldbe changes together. Always check https://github.com/rprichard/winpty/releases for the current version.
-WINPTY_VERSION=0.3.1
-CYGWIN_VERSION=2.5.1
+WINPTY_VERSION=0.4.0
+CYGWIN_VERSION=2.5.2
 ##
 
 # Console colors

From d4227d1bc61211bebfdc7520c9d4447ac7a411dd Mon Sep 17 00:00:00 2001
From: Leonid Makarov <leonid.makarov@ffwagency.com>
Date: Fri, 26 Aug 2016 14:57:21 -0700
Subject: [PATCH 3/4] Version bump 1.7.0

---
 CHANGELOG.md | 9 +++++++++
 VERSION      | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 218961d..99166a2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,14 @@
 # Changelog
 
+## 1.7.0 (2016-08-26)
+
+- IMPORTANT: this release requires VirtualBox v5.1.x and Vagrant v1.8.5+
+- Version updates
+  - blinkreaction/boot2docker base box v1.12.1
+  - docker cli 1.12.1
+  - docker-compose 1.8.0
+  - winpty 0.4.0 (Windows only)
+
 ## 1.6.2 (2016-06-27)
 
 - Hotfix: Fixed broken winpty dependency since 1.6.0 on Windows
diff --git a/VERSION b/VERSION
index 308b6fa..9dbb0c0 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.6.2
\ No newline at end of file
+1.7.0
\ No newline at end of file

From c2d2e91d0b46c94c51d758c01276c5a1514fb407 Mon Sep 17 00:00:00 2001
From: Leonid Makarov <leonid.makarov@ffwagency.com>
Date: Fri, 26 Aug 2016 15:00:20 -0700
Subject: [PATCH 4/4] README updates

---
 README.md | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 828b49d..c5dbc80 100644
--- a/README.md
+++ b/README.md
@@ -11,9 +11,9 @@ The stock boot2docker/docker-machine mounts host volumes via VirtualBox Guest Ad
 
 <a name="requirements"></a>
 ## Prerequisites
-1. [VirtualBox](https://www.virtualbox.org/) 5.0.x
-2. [Vagrant](https://www.vagrantup.com/) 1.7.3+
-3. [Babun](http://babun.github.io) - A Linux-type shell, **Windows only**
+1. [VirtualBox](https://www.virtualbox.org/) 5.1.x
+2. [Vagrant](https://www.vagrantup.com/) 1.8.5+
+3. [Babun](http://babun.github.io) - A Linux-type shell + [winpty](https://github.com/rprichard/winpty), **Windows only**
 
 For best result and a clean setup it is recommended to remove any previous versions of VirtualBox, Vagrant, boot2docker, docker and docker-compose.
 
@@ -50,6 +50,8 @@ Designate a root folder that the VM will have access to (e.g. `~/Projects`) and
 
 ### Manual installation
 
+Use these steps if you have VirtualBox and/or Vagrant already installed or prefer/need to install them manually.
+
 1. Copy `Vagrantfile` and `vagrant.yml` into a designated folder
 2. Inside the folder run