fixed `berksfile_path must be set` error on `vagrant up`
Merge branch 'master' into develop