Upgrade to 1.0.0.M5