Fixed #1060
Merge branch 'refactor' of github.com:FPtje/DarkRP into refactor