WIP: DO NOT MERGE - test pr https://github.com/recalbox/recalbox-emulationstation/pull/185

digitalLumberjack requested to merge test-github-pr-185-fix-wsod into master Feb 09, 2017