Merge branch 'master' into develop

.github/ISSUE_TEMPLATE/2_MARKETPLACE_SUPPORT.md

@@ -0,0 +1,8 @@
+---
+name: "🛒 Marketplace Support"
+about: 'For reporting any issues with the marketplace, send an email to hello@octobercms.com'
+---
+
+All marketplace support issues will be addressed through email support.
+
+Thanks!

.github/ISSUE_TEMPLATE/3_GENERAL_SUPPORT.md

@@ -1,12 +1,12 @@
 ---
-name: "⚠️ Support Question"
-about: 'This repository is only for reporting bugs or problems. If you need help, see: https://octobercms.com/support'
+name: "⚠️ General Support"
+about: 'This repository is only for reporting bugs or problems. If you need help using OctoberCMS, see: https://octobercms.com/support'
 ---
 
 This repository is only for reporting bugs or problems. If you need support, please use the following options:
 
 - Forum: https://octobercms.com/forum
-- Slack: https://octobercms.slack.com (Invite link: https://octobercms-slack.herokuapp.com/)
+- Slack: https://octobercms.slack.com (Get an invite: https://octobercms-slack.herokuapp.com/)
 - Stack Overflow: https://stackoverflow.com/questions/tagged/octobercms
 
 Thanks!