Merge remote-tracking branch 'upstream/one-3.8' into one-3.8
Merge branch 'one-3.8' of github.com:arax/one into one-3.8
bug #1966: Fix for wrong CDROM removing
Bug #1995: Look for vmx file
Merge branch 'one-3.8' of github.com:arax/one into one-3.8
Merge remote-tracking branch 'upstream/one-3.8' into one-3.8