[Bug 226114] Merge Review: m2crypto