Merge branch 'development' of github.com:aakb/vagrant into development