Merge pull request #3362 from Kilakk/dev

Fixes #3266 - Cell timers will no longer start automagically
Merge remote-tracking branch 'upstream/dev' into dev
Removed the (empty) medkits from ERT backpacks