Merge branch threadshare-tokio-0.2 with latest master
Note: this should be forced pushed to threadshare-tokio-0.2
Due to an influx of spam, we have had to impose restrictions on new accounts. Please see this wiki page for instructions on how to get full permissions. Sorry for the inconvenience.
Note: this should be forced pushed to threadshare-tokio-0.2