retro functions shim
fix vagrant up
Merge origin/master