VirtualBox fix for octopus (rebased onto develop)



This is the same as gh-2579 but rebased onto develop.

----

One of those mysterious inexplicable VirtualBox issues.