Upgrade to apm 0.95