Merge branch 'hotfix' of github.com:Venture-TheSphinxTeam/Sphinx into hotfix
Merge branch 'master' of https://github.com/Venture-TheSphinxTeam/Sphinx
Ricky is dead.

Goodnight sweet prince