Fix after merge
Merge remote-tracking branch 'origin/master' into Mega-shuriken-bug