Merge remote-tracking branch 'origin/dev' into dev

src/Discord.Net.Commands/Utilities/ReflectionUtils.cs

@@ -58,7 +58,7 @@ namespace Discord.Commands
             {
                 foreach (var prop in ownerType.DeclaredProperties)
                 {
-                    if (prop.SetMethod?.IsPublic == true && prop.GetCustomAttribute<DontInjectAttribute>() == null)
+                    if (prop.GetMethod?.IsStatic == false && prop.SetMethod?.IsPublic == true && prop.GetCustomAttribute<DontInjectAttribute>() == null)
                         result.Add(prop);
                 }
                 ownerType = ownerType.BaseType.GetTypeInfo();

src/Discord.Net.Core/Entities/Messages/EmbedType.cs

@@ -7,6 +7,7 @@
         Video,
         Image,
         Gifv,
-        Article
+        Article,
+        Tweet
     }
 }