Merge "Deprecated UserManager.getUsers(excludeDying) / added getAliveUsers()"