Merge branch 'master' into hordes
Merge branch 'hordes' of https://reaper42@github.com/Reaper42/Cataclysm-DDA.git into hordes
Merge branch 'hordes' into fork_reaper