Merge the most recent changes from branch 'master' of https://github.com/Tox/toxic

Sorry if I screw this up, just trying to keep it updated