Merge branch 'feature/vagrant'