Support m2e 1.5

This fixes #205, although an update site is still needed to channel this to end users.
Please merge this into a new `m2e-1.5` branch.