Merge "Add NS_USER, NS_USER_TALK aliases for Old English"