pulling in Matt Wrock's changes to virtual box