Bump m2r, drop puma leftover.