Fix bug with infinite looping (hopefully)
Merge branch 'master' of github.com:jmccrae/yuzu