Update aliases, merge changes with orgrimmar