Merge remote-tracking branch 'upstream/dev' into dev
Merge branch 'dev' of https://github.com/fittysix/SickRage into dev