Merge remote-tracking branch 'upstream/master' into weapon_anims

# Conflicts:
#	Resources/Prototypes/MeleeWeaponAnimations/default.yml

Content.Shared/GameObjects/Components/Weapons/Ranged/MagazineAutoEjectMessage.cs

@@ -0,0 +1,12 @@
+using System;
+using Robust.Shared.GameObjects;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.GameObjects.Components.Weapons.Ranged
+{
+    /// <summary>
+    /// This is sent if the MagazineBarrel AutoEjects the magazine
+    /// </summary>
+    [Serializable, NetSerializable]
+    public sealed class MagazineAutoEjectMessage : ComponentMessage {}
+}