Merge remote-tracking branch 'origin/first-map' into feature-weapons