Merge "Replaced UserManager.getUsers(excludeDying) by getAliveUsers()"