Upgrade to apm 0.71