Fixed crash due to using clientside code on server. This is going to be stealth updated in.
Merge branch 'master' into Build79