Merge branch 'develop' of git.stratosphe.re:reddit/teslore into develop

ummm
Merge branch 'develop'