FIX TO THE MOST EPIC BUG EVER (HOPEFULLY)
Merge branch 'master' into Ishin