[VirtualBox/f29: 6/7] Merge branch 'master' into f29