[VirtualBox/f28: 2/2] Merge branch 'f29' into f28