vagrant
Merge branch 'backports'
vbox & vagrant dirs