Merge "Adapt for the inclusion of m2e in EclipseIndigo"