Upgrade to apm 0.91