Fix system breaking bug(s).
Merge branch '3.0.x' of github.com:wbbaddons/Tims-Chat into 3.0.x
Merge branch '3.0.x'