Add a fix / work-around to xorg.conf detection when running as a VirtualBox
guest
Merge remote-tracking branch 'upstream/master'