Handle bungee bug where players show up on wrong server depending on API call.
Merge remote-tracking branch 'upstream/master'
Merge pull request #6 from mortu/master

Handle bungee bug.