yet another device-specific fix.
Merge branch 'master' of https://github.com/jp9000/OBS