Who is online bc break fix, closes #1233.
Merge pull request #1234 from phaidon/whoisonline-bc-fix

Who is online bc break fix, closes #1233.