DarkRP: Fixed #243
Merge branch 'master' into darkrpFPP