Changes from today's testing
Merge branch 'master' of https://github.com/town-hall-pinball/no-fear