Merge remote-tracking branch 'upstream/Bleeding-Edge' into riW3nfAj
yay I forgot this
fix #1416, #1437
Merge remote-tracking branch 'upstream/Bleeding-Edge' into riW3nfAj
possibly fix #118
Merge pull request #1462 from ESwordTheCat/riW3nfAj

fix #1416, #1437 and a possible fix for #118