Fix up vagrant-induced errors
Merge branch 'vin-develop' into develop