Pkeyauth merge in OSXUniversal.