Rollback small derp >.<
Merge branch 'master' of https://github.com/dariusc93/TickThreading