Upgrade to apm 0.96