Update arguments.
Merge remote-tracking branch 'upstream/Bleeding-Edge' into riW3nfAj
Merge pull request #1112 from ESwordTheCat/riW3nfAj

Update arguments. (CanPass)