Merge "Fix build in m2eclipse 1.0"