Merge "use quaternions instead of MRPs"