Upgrade to apm 0.82