Upgrade to Argonaut 6.1-M5.