Merge branch 'master' of http://git.int.zerotier.com/zerotier/ZeroTierOne into dev

.github/ISSUE_TEMPLATE/bugs-and-issues.md

@@ -12,10 +12,8 @@ assignees: ''
 _Using these will ensure you get quicker support, and make this space available for code-related issues. Thank you!_
 
 - [Knowledge Base](https://zerotier.atlassian.net/wiki/spaces/SD/overview) => Guides and documentation on how to use ZeroTier.
-- [Discuss Forum](https://discuss.zerotier.com/) => Our discussion forum for users and support to mutally resolve issues & suggest ideas.
-- [Reddit](https://www.reddit.com/r/zerotier/) => Our subreddit, which we monitor regularly and is fairly active.
+- [Community Forum](https://discuss.zerotier.com/) => Our discussion forum for users and support to mutally resolve issues & suggest ideas.
 - https://www.zerotier.com/contact/ => Sales and licensing queries
-- https://zerotier.atlassian.net/servicedesk/customer/portals => Customer Support Portal
 
 # If you still want to file a Bug Report
 

.github/ISSUE_TEMPLATE/game-connection-issue.md

@@ -12,4 +12,4 @@ Are you having trouble connecting to a game on your virtual network after instal
 - [ ] Yes
 - [ ] No
 
-If you answered yes, then it is very likely that your question would be better answered on our [Discuss ](https://discuss.zerotier.com) forum or [Reddit](https://www.reddit.com/r/zerotier/) community; we monitor both regularly. We also have extensive documentation on our [Knowledge Base](https://zerotier.atlassian.net/wiki/spaces/SD/overview). Thank you!
+If you answered yes, then it is very likely that your question would be better answered on our [Community Forums](https://discuss.zerotier.com) or [Reddit](https://www.reddit.com/r/zerotier/) community; we monitor both regularly. We also have extensive documentation on our [Knowledge Base](https://zerotier.atlassian.net/wiki/spaces/SD/overview). Thank you!