Merge remote-tracking branch 'upstream/Bleeding-Edge' into riW3nfAj
Merge remote-tracking branch 'upstream/Bleeding-Edge' into riW3nfAj
thanks constant 200
Merge pull request #1262 from ESwordTheCat/riW3nfAj

thanks constant 200